Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorAndrew Tridgell <tridge@samba.org>
Thu, 19 Mar 2009 23:01:17 +0000 (10:01 +1100)
committerAndrew Tridgell <tridge@samba.org>
Thu, 19 Mar 2009 23:01:17 +0000 (10:01 +1100)

Trivial merge