Merge branch 'v3-2-test' of git://git.samba.org/samba into v3-2-test
authorJames Peach <jpeach@samba.org>
Fri, 14 Dec 2007 04:56:53 +0000 (20:56 -0800)
committerJames Peach <jpeach@samba.org>
Fri, 14 Dec 2007 04:56:53 +0000 (20:56 -0800)
commit7b457645fb40d7195d75f8e38883b140abcb1955
tree90c3ca21cd40c98ed4c7c1580b75216f689fad97
parent12ac4c3119b3b7712e670d95d61413d97ecafaef
parent138333ed1f571cd6bb76c3be655f70e35cd48a99
Merge branch 'v3-2-test' of git://git.samba.org/samba into v3-2-test
(This used to be commit 0de2b3eb515f2da21ffd1ce54979bb1f8063024b)