Merge branch 'merge'
authorPaul Mackerras <paulus@samba.org>
Wed, 3 Dec 2008 09:11:06 +0000 (20:11 +1100)
committerPaul Mackerras <paulus@samba.org>
Wed, 3 Dec 2008 09:11:06 +0000 (20:11 +1100)

Trivial merge