Merge commit 'ronnie/master'
authorAndrew Tridgell <tridge@samba.org>
Fri, 6 Mar 2009 00:26:20 +0000 (11:26 +1100)
committerAndrew Tridgell <tridge@samba.org>
Fri, 6 Mar 2009 00:26:20 +0000 (11:26 +1100)

Trivial merge