From: Gerald (Jerry) Carter <jerry@samba.org>
Date: Mon, 14 Jan 2008 21:10:14 +0000 (-0600)
Subject: Merge commit 'samba/v3-2-test' into v3-2-stable
X-Git-Url: http://git.samba.org/?p=tprouty%2Fsamba.git;a=commitdiff_plain;h=9a50c929ba0de8c0d1f7fc515cc6b3d954a6c9d7

Merge commit 'samba/v3-2-test' into v3-2-stable
(This used to be commit bb36b74a4e8fa63672031145b6d39d79468241d9)
---

9a50c929ba0de8c0d1f7fc515cc6b3d954a6c9d7