Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorAndrew Tridgell <tridge@samba.org>
Mon, 25 May 2009 23:26:47 +0000 (09:26 +1000)
committerAndrew Tridgell <tridge@samba.org>
Mon, 25 May 2009 23:26:47 +0000 (09:26 +1000)

Trivial merge