Merge branch 'v3-0-test' of ssh://jra@git.samba.org/data/git/samba into v3-0-test
commitbd93b038099197787c733a8660ced59852c3f1b5
authorJeremy Allison <jra@samba.org>
Mon, 25 Aug 2008 22:15:25 +0000 (25 15:15 -0700)
committerJeremy Allison <jra@samba.org>
Mon, 25 Aug 2008 22:15:25 +0000 (25 15:15 -0700)
tree8a8ebf80cf1c07a9bbd013c6e695e73ddb173b89
parente05cf6e9337f949d369c915d8eec20dc58aa614e
parentd4f5b5255f9b95050ddd9d67bd3958402be77918
Merge branch 'v3-0-test' of ssh://jra@git.samba.org/data/git/samba into v3-0-test