Merge commit 'ronnie/master'
authorAndrew Tridgell <tridge@samba.org>
Wed, 16 Jul 2008 06:58:16 +0000 (16:58 +1000)
committerAndrew Tridgell <tridge@samba.org>
Wed, 16 Jul 2008 06:58:16 +0000 (16:58 +1000)

Trivial merge