Merge branch 'v3-0-test' of ssh://jra@git.samba.org/data/git/samba into v3-0-test
authorJeremy Allison <jra@samba.org>
Wed, 12 Dec 2007 17:49:26 +0000 (09:49 -0800)
committerJeremy Allison <jra@samba.org>
Wed, 12 Dec 2007 17:49:26 +0000 (09:49 -0800)
commitdc80d5264949da4e9c91035851a6f8c19e546ed2
tree6083618d4e897378ed261fe7b2238761276d960b
parentf652ce4ab63ba24b298142099efd751d270d1e07
parent821de8a047eea10fefb0851792a9e4633c16d871
Merge branch 'v3-0-test' of ssh://jra@git.samba.org/data/git/samba into v3-0-test