Merge branch 'v3-0-test' of git://git.samba.org/samba into v3-0-test
authorJohn H Terpstra <jht@samba.org>
Fri, 6 Jun 2008 19:13:38 +0000 (14:13 -0500)
committerJohn H Terpstra <jht@samba.org>
Fri, 6 Jun 2008 19:13:38 +0000 (14:13 -0500)
commit1af605bd21383be3c14a60f4c15b77281f4c88a7
tree1a7efba9940982dea9894b08a28b1dfc4d5e3b5f
parent4f876631b65ab915466526e7f5b97cff2ec92dae
parent36729f6f1680310d51f126aa4b7760f11e405a9c
Merge branch 'v3-0-test' of git://git.samba.org/samba into v3-0-test