Merge branch 'v3-2-test' of git://git.samba.org/samba into v3-2-test
authorJames Peach <jpeach@samba.org>
Sat, 22 Dec 2007 22:01:44 +0000 (14:01 -0800)
committerJames Peach <jpeach@samba.org>
Sat, 22 Dec 2007 22:01:44 +0000 (14:01 -0800)
commit30cb2d215f1a4a440d5ecaab3f898daa714eee2b
tree7bcd98a89b072d827bd44475c9792e00886ea036
parentde3c5b808a941ac8e9ebe7169536d8290067eef5
parentcebaa483e62910ac3f87cd135b2aff18dc880416
Merge branch 'v3-2-test' of git://git.samba.org/samba into v3-2-test