Merge branch 'v3-2-test' of git://git.samba.org/samba into v3-2-test
authorJohn H Terpstra <jht@samba.org>
Wed, 28 May 2008 15:59:44 +0000 (10:59 -0500)
committerJohn H Terpstra <jht@samba.org>
Wed, 28 May 2008 15:59:44 +0000 (10:59 -0500)
commit78dd88491abe4d7ec2586b1c6e05049051dbfeb6
tree8534fd0ba94f21515cafa6aa1787462cd50dcd4f
parentf8e4a675f9ee4bfa4da15c0d6bfb9b8ad24694c8
parentd03099a438e75167e28ef1492872bdfd139983d7
Merge branch 'v3-2-test' of git://git.samba.org/samba into v3-2-test