Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-test
commitadd597f77c245807905f62b81cad52b03d7a7c74
authorDerrell Lipman <derrell.lipman@unwireduniverse.com>
Thu, 17 Jan 2008 16:50:41 +0000 (17 11:50 -0500)
committerDerrell Lipman <derrell.lipman@unwireduniverse.com>
Thu, 17 Jan 2008 16:50:41 +0000 (17 11:50 -0500)
tree41cecb2b1869c4a9603f7d95d2a1d0b7b36ace49
parent46080b0f4eea6285a8f2009e8ab6cf58623c1f6f
parent9e3634fb63f6dec1a3c820a462b5f732e7d09206
Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-test
(This used to be commit 7135d2aea5a68a79e2a77d4a02219436f5e154cc)