Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorAndrew Tridgell <tridge@samba.org>
Thu, 28 May 2009 06:12:34 +0000 (16:12 +1000)
committerAndrew Tridgell <tridge@samba.org>
Thu, 28 May 2009 06:12:34 +0000 (16:12 +1000)

Trivial merge