Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
authorAndrew Bartlett <abartlet@samba.org>
Sun, 6 Apr 2008 09:16:43 +0000 (19:16 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Sun, 6 Apr 2008 09:16:43 +0000 (19:16 +1000)
commit5454dc044da9e3c91fca6e55659a6d6a44179b4f
treedb992a4a271b36032efd60cb7bb5cdc4b365fd62
parent4c449fe95f20676553b04a6028310191b4a2a32a
parentc30f9add8cc5b060b73381f53671ecd01c31cdd8
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
(This used to be commit beff331e15e7896d80831135fd52b90cd9ab073e)