Merge commit 'ronnie/master'
authorAndrew Tridgell <tridge@samba.org>
Fri, 11 Jul 2008 09:21:39 +0000 (19:21 +1000)
committerAndrew Tridgell <tridge@samba.org>
Fri, 11 Jul 2008 09:21:39 +0000 (19:21 +1000)

Trivial merge