Merge commit 'ronnie/master'
authorAndrew Tridgell <tridge@samba.org>
Mon, 11 Aug 2008 13:33:46 +0000 (23:33 +1000)
committerAndrew Tridgell <tridge@samba.org>
Mon, 11 Aug 2008 13:33:46 +0000 (23:33 +1000)

Trivial merge