Merge branch 'v3-2-test' of git://git.samba.org/samba into v3-2-test
commit4cd08cbdea6e8076fe8878cb931fb0a85f845ecd
authorJohn H Terpstra <jht@samba.org>
Sat, 7 Jun 2008 20:12:25 +0000 (7 15:12 -0500)
committerJohn H Terpstra <jht@samba.org>
Sat, 7 Jun 2008 20:12:25 +0000 (7 15:12 -0500)
treec405ad62621cff5a2b2ceae67b4f1eef07d69033
parenta3d5bed503d665ebcb2fa09753b8b0d20d43c7d7
parent20aa14480e9ae6cea663c67fe9e2d1d3b6fafa7d
Merge branch 'v3-2-test' of git://git.samba.org/samba into v3-2-test