Merge commit 'ronnie/master'
authorAndrew Tridgell <tridge@samba.org>
Tue, 7 Apr 2009 07:07:41 +0000 (17:07 +1000)
committerAndrew Tridgell <tridge@samba.org>
Tue, 7 Apr 2009 07:07:41 +0000 (17:07 +1000)

Trivial merge