Merge branch 'v3-2-test' of git://git.samba.org/samba into v3-2-test
commit6fa097f0534151728be6c76cf04820594bb97dca
authorJohn H Terpstra <jht@samba.org>
Tue, 10 Jun 2008 03:47:00 +0000 (9 22:47 -0500)
committerJohn H Terpstra <jht@samba.org>
Tue, 10 Jun 2008 03:47:00 +0000 (9 22:47 -0500)
tree9802dad6ba83b22cf52d36485101ac4cec296768
parent4cd08cbdea6e8076fe8878cb931fb0a85f845ecd
parent2089c692cfe5a4f9bbed1e658c6f73c310dbff57
Merge branch 'v3-2-test' of git://git.samba.org/samba into v3-2-test