Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
commit067d4a889a218c79cc2e343e542d9c2f0af459d6
authorJeremy Allison <jra@samba.org>
Tue, 20 Jan 2009 02:11:33 +0000 (19 18:11 -0800)
committerJeremy Allison <jra@samba.org>
Tue, 20 Jan 2009 02:11:33 +0000 (19 18:11 -0800)
tree662bbc9c5ce68a21c25b0cb49967bac0aa7eb128
parente9de9cd33a3260c0b1b019208db9c3f96d9d5f3a
parent5db09d4dd27e10c926c3413bcd3088e72a4af487
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test