Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
authorJeremy Allison <jra@samba.org>
Sun, 17 Aug 2008 02:27:25 +0000 (19:27 -0700)
committerJeremy Allison <jra@samba.org>
Sun, 17 Aug 2008 02:27:25 +0000 (19:27 -0700)
commit77a0d72ffe9764faa4accdf9240c1d482404d01d
treeeb5cf4cfa1abf69e450b50ec5975a535a5daf2aa
parent780a4ff80dfd03a2c422920dbd101e8f58f7136e
parent7e05ff65a7907bf34e2d422f7c941002cfb86971
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test