Merge branch 'v3-0-test' of git://git.samba.org/samba into v3-0-test
authorJohn H Terpstra <jht@samba.org>
Thu, 19 Jun 2008 16:11:59 +0000 (11:11 -0500)
committerJohn H Terpstra <jht@samba.org>
Thu, 19 Jun 2008 16:11:59 +0000 (11:11 -0500)
commit2ecba5312bbbeb28f939bddb04a2bd84771a8ecc
treef9a2c6ea80ba761232bf6763cb7001a6b53876fe
parent407d9916a791d8b734b6aa61ec60bf56496b4389
parent4e755cb5f56ee15c5151efc0dfed280c91819a39
Merge branch 'v3-0-test' of git://git.samba.org/samba into v3-0-test