From: Jim McDonough <jmcd@samba.org>
Date: Tue, 13 May 2008 22:42:18 +0000 (-0400)
Subject: Merge branch 'v3-3-test' of git://git.samba.org/samba into 3.3-test
X-Git-Tag: samba-4.0.0alpha6~801^2~1388
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2ca5098e3591fa006a90f2f44dc1d5455f501703;p=thirdparty%2Fsamba.git

Merge branch 'v3-3-test' of git://git.samba.org/samba into 3.3-test
(This used to be commit 6dd44ebf22762e852b43e7dbcd095a58cc45abad)
---

2ca5098e3591fa006a90f2f44dc1d5455f501703