Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
authorJeremy Allison <jra@samba.org>
Thu, 6 Dec 2007 19:17:37 +0000 (11:17 -0800)
committerJeremy Allison <jra@samba.org>
Thu, 6 Dec 2007 19:17:37 +0000 (11:17 -0800)
commit9bd35ef153ef4b7f892dcf9e69c2232b940a9e18
treecf531cf8f0b2e0122d8956fecaae7370ab8bcebd
parent4acfce6b036ae1a0bf152a94bb5d6194e93f4004
parentbf80f40ca4bcbf0b5f5d3f7f988f121d29fd3edf
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
(This used to be commit 48252d124d83aaa502b7821564978b9bf5babd03)