Merge branch 'v3-2-test' of git://git.samba.org/samba into v3-2-test
commit8c88a43a2aba2a701e3e8b72ba2c119ea0b842c8
authorJohn H Terpstra <jht@samba.org>
Sat, 31 May 2008 15:14:59 +0000 (31 10:14 -0500)
committerJohn H Terpstra <jht@samba.org>
Sat, 31 May 2008 15:14:59 +0000 (31 10:14 -0500)
tree14d31fe2685d0e97a6d4845549317982ff27582a
parentb96c9d54cfd29ec87d59655839a4136977a98032
parent87a3d59dfcb8e6ae7349de55bb9532e9ae1851a5
Merge branch 'v3-2-test' of git://git.samba.org/samba into v3-2-test