Merge commit 'ronnie/master'
authorAndrew Tridgell <tridge@samba.org>
Thu, 23 Apr 2009 01:00:16 +0000 (11:00 +1000)
committerAndrew Tridgell <tridge@samba.org>
Thu, 23 Apr 2009 01:00:16 +0000 (11:00 +1000)

Trivial merge