Merge branch 'v3-2-test' of git://git.samba.org/samba into v3-2-test
authorJohn H Terpstra <jht@samba.org>
Wed, 21 May 2008 13:46:40 +0000 (08:46 -0500)
committerJohn H Terpstra <jht@samba.org>
Wed, 21 May 2008 13:46:40 +0000 (08:46 -0500)
commit6b83aef5c7360480b0d27a5957328566c554d669
tree529df4cb7d60bb40262847ed40c26d8db4f0bf30
parent3a8ea6be389bedbcdb5668664d862768c026f669
parent2d06726b7b65a9071a872ac71a09a614270c6b2c
Merge branch 'v3-2-test' of git://git.samba.org/samba into v3-2-test