Merge branch 'master' into dev
authorPaul Mackerras <paulus@samba.org>
Mon, 31 Dec 2007 01:49:22 +0000 (12:49 +1100)
committerPaul Mackerras <paulus@samba.org>
Mon, 31 Dec 2007 01:49:22 +0000 (12:49 +1100)

Trivial merge