From: Andrew Bartlett <abartlet@samba.org>
Date: Tue, 17 Jun 2008 12:46:34 +0000 (+1000)
Subject: Merge branch 'v3-3-test' of ssh://git.samba.org/data/git/samba into 3-3-abartlet
X-Git-Tag: samba-4.0.0alpha6~801^2~1024
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=08d63adc6197b5bbe7a64c4e8e1b547e5c478797;p=thirdparty%2Fsamba.git

Merge branch 'v3-3-test' of ssh://git.samba.org/data/git/samba into 3-3-abartlet
(This used to be commit a09ed6016a41a9ed45716579e59a646545054f63)
---

08d63adc6197b5bbe7a64c4e8e1b547e5c478797