Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Wed, 30 Jul 2008 21:48:16 +0000 (07:48 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Wed, 30 Jul 2008 21:48:16 +0000 (07:48 +1000)
commit337752cfd82dc3dbdf918fd45eddd1aa8fb04576
tree79aa04fbf294add814fb060f73a1909733b18ec4
parent2a0677e514b5b9f91d32339077cc7e4187525c3b
parente45c3e127d389a2cb63879ca12bbbfed048f4eb1
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
(This used to be commit 15d0951b74b46763024560f9cd012338473c5bc3)