Merge commit 'ronnie/master'
authorAndrew Tridgell <tridge@samba.org>
Thu, 17 Jul 2008 08:45:15 +0000 (18:45 +1000)
committerAndrew Tridgell <tridge@samba.org>
Thu, 17 Jul 2008 08:45:15 +0000 (18:45 +1000)

Trivial merge