From: Derrell Lipman <derrell.lipman@unwireduniverse.com>
Date: Wed, 16 Jan 2008 02:30:21 +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~3886
X-Git-Url: http://git.samba.org/?p=samba.git;a=commitdiff_plain;h=f426949e8861b3a97d321516edbcbd771b7d6273

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

f426949e8861b3a97d321516edbcbd771b7d6273