Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorAndrew Tridgell <tridge@samba.org>
Wed, 14 Apr 2010 13:38:05 +0000 (23:38 +1000)
committerAndrew Tridgell <tridge@samba.org>
Wed, 14 Apr 2010 13:38:05 +0000 (23:38 +1000)

Trivial merge