Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorAndrew Tridgell <tridge@samba.org>
Mon, 1 Jun 2009 00:39:30 +0000 (10:39 +1000)
committerAndrew Tridgell <tridge@samba.org>
Mon, 1 Jun 2009 00:39:30 +0000 (10:39 +1000)

Trivial merge