Merge commit 'samba/v3-2-test' into v3-2-stable
authorGerald (Jerry) Carter <jerry@samba.org>
Mon, 14 Jan 2008 15:49:47 +0000 (09:49 -0600)
committerGerald (Jerry) Carter <jerry@samba.org>
Mon, 14 Jan 2008 15:49:47 +0000 (09:49 -0600)
commit582bd8071f168190e0cf1f6d1637f79ebee287c3
treed10d1f8ebab5bdd0d6644f6fbf98d7a825ce6f84
parent84f12a59600bc3f686959d0e17cf972319059e02
parent351377a90e44d8011a697779d2e9e225427e5cbb
Merge commit 'samba/v3-2-test' into v3-2-stable
(This used to be commit 6811ea1ce2d46f7303b4edf661e27d2edf54724f)