Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorAndrew Tridgell <tridge@samba.org>
Tue, 31 Mar 2009 02:59:56 +0000 (13:59 +1100)
committerAndrew Tridgell <tridge@samba.org>
Tue, 31 Mar 2009 02:59:56 +0000 (13:59 +1100)

Trivial merge