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-3.2.0pre2~37^2~549
X-Git-Url: http://git.samba.org/samba.git/?p=ira%2Fwip.git;a=commitdiff_plain;h=4ff2101c69a0cfcfdc5f775493cb6e88c57e4bbe;hp=-c

Merge branch 'v3-2-test' of git://git.samba.org/samba into v3-2-test
---

4ff2101c69a0cfcfdc5f775493cb6e88c57e4bbe