Merge branch 'v3-0-test' of git://git.samba.org/samba into v3-0-test
authorJohn H Terpstra <jht@samba.org>
Thu, 5 Jun 2008 15:54:32 +0000 (10:54 -0500)
committerJohn H Terpstra <jht@samba.org>
Thu, 5 Jun 2008 15:54:32 +0000 (10:54 -0500)
commit4f876631b65ab915466526e7f5b97cff2ec92dae
treea6835b35339233a40bc16c1dcdd0535cb0061939
parente4848b36cae506fc6d7f7fa189d226fe551db2f4
parent7fdb5eb6d7dd42fa036edf216d66fea582b6a3f4
Merge branch 'v3-0-test' of git://git.samba.org/samba into v3-0-test