Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorAndrew Tridgell <tridge@samba.org>
Mon, 23 Mar 2009 00:47:38 +0000 (11:47 +1100)
committerAndrew Tridgell <tridge@samba.org>
Mon, 23 Mar 2009 00:47:38 +0000 (11:47 +1100)

Trivial merge