Merge branch 'v3-0-test' of ssh://jra@git.samba.org/data/git/samba into v3-0-test
authorJeremy Allison <jra@samba.org>
Wed, 25 Jun 2008 21:57:46 +0000 (14:57 -0700)
committerJeremy Allison <jra@samba.org>
Wed, 25 Jun 2008 21:57:46 +0000 (14:57 -0700)
commit4d7aafc521307d4d3701935c70673afa569a75d5
tree73b17f35e01bb73b730ea6d898fd95b40af18b36
parent021193844ce74a36fc4932171533714b402b7282
parent30e2e2df600727d64d7ae5daf47e3f04a11975eb
Merge branch 'v3-0-test' of ssh://jra@git.samba.org/data/git/samba into v3-0-test