Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-abartlet
authorAndrew Bartlett <abartlet@samba.org>
Sun, 3 Feb 2008 22:56:24 +0000 (09:56 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Sun, 3 Feb 2008 22:56:24 +0000 (09:56 +1100)
(This used to be commit 377a7c633d4813c134b91739c507dcefb55c9691)


Trivial merge