Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorAndrew Tridgell <tridge@samba.org>
Tue, 24 Feb 2009 00:40:28 +0000 (11:40 +1100)
committerAndrew Tridgell <tridge@samba.org>
Tue, 24 Feb 2009 00:40:28 +0000 (11:40 +1100)

Trivial merge