Merge branch 'v3-2-test' of git://git.samba.org/samba into v3-2-test
authorDerrell Lipman <derrell.lipman@unwireduniverse.com>
Wed, 16 Jan 2008 14:41:43 +0000 (14:41 +0000)
committerDerrell Lipman <derrell.lipman@unwireduniverse.com>
Wed, 16 Jan 2008 14:41:43 +0000 (14:41 +0000)
commitbe9b7a6414cda06b400d654f73f17327a1a6f69c
tree9534b3c8c21c96cc8ddfa50740fb8bab5f7121a4
parent3e494442de5eff6d0619c793eef139c15efe0657
parent594a1645482cd4f993df7d63f5037a159de03442
Merge branch 'v3-2-test' of git://git.samba.org/samba into v3-2-test
(This used to be commit aebecd7462733b56457540423354ba249fd52808)