Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
commit3038dd8a4ffae4113f49547a9d4d6b1c8c46397a
authorAndrew Bartlett <abartlet@samba.org>
Wed, 28 May 2008 03:42:29 +0000 (28 13:42 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Wed, 28 May 2008 03:42:29 +0000 (28 13:42 +1000)
tree6528410c88eb7ba50dd9eca1652bae8892d1f868
parentcb0dcd5c3dfe2a46755270a4594b7289f555d814
parent7ae25aa6125e5375ac9c080a1e95fa34bda0dbe1
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet