Merge commit 'ronnie/master'
authorAndrew Tridgell <tridge@samba.org>
Thu, 20 Nov 2008 10:23:26 +0000 (21:23 +1100)
committerAndrew Tridgell <tridge@samba.org>
Thu, 20 Nov 2008 10:23:26 +0000 (21:23 +1100)

Trivial merge