Merge branch 'v3-2-test' of git://git.samba.org/samba into v3-2-test
commit0de2b3eb515f2da21ffd1ce54979bb1f8063024b
authorJames Peach <jpeach@samba.org>
Fri, 14 Dec 2007 04:56:53 +0000 (13 20:56 -0800)
committerJames Peach <jpeach@samba.org>
Fri, 14 Dec 2007 04:56:53 +0000 (13 20:56 -0800)
treef6304f78be15f6f536dcde7b63a34293b28296e9
parent1e7241517d1f55d60af22570e0c9feb280e3fdb5
parent27078d1292e8588956ae78e4cddb1bcebbe84478
Merge branch 'v3-2-test' of git://git.samba.org/samba into v3-2-test