From: Derrell Lipman <derrell.lipman@unwireduniverse.com>
Date: Wed, 16 Jan 2008 00:45:06 +0000 (+0000)
Subject: Merge branch 'v3-2-test' of git://git.samba.org/samba into v3-2-test
X-Git-Tag: samba-4.0.0alpha6~801^2~3887
X-Git-Url: http://git.samba.org/samba.git/?p=ira%2Fwip.git;a=commitdiff_plain;h=6e94cbdc30afc3c9b5d2504aa8649fa9c87af7aa

Merge branch 'v3-2-test' of git://git.samba.org/samba into v3-2-test
(This used to be commit f963d57096184dd9381fcc5f175150d27460ea7a)
---

6e94cbdc30afc3c9b5d2504aa8649fa9c87af7aa