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

Trivial merge