From: Gerald W. Carter <jerry@samba.org>
Date: Wed, 16 Jan 2008 16:35:36 +0000 (-0600)
Subject: Merge branch 'v3-2-test-merge' into v3-2-stable
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=1a6415fc77c708b87c8e2ce6e7828f486ffc87ac;p=tprouty%2Fsamba.git

Merge branch 'v3-2-test-merge' into v3-2-stable
(This used to be commit 6993b6139419761c649f3ad54467a2c34f29382d)
---

1a6415fc77c708b87c8e2ce6e7828f486ffc87ac