From: John H Terpstra <jht@samba.org>
Date: Wed, 21 May 2008 20:39:14 +0000 (-0500)
Subject: Merge branch 'v3-0-test' of git://git.samba.org/samba into v3-0-test
X-Git-Tag: release-3-0-31~17^2~13
X-Git-Url: http://git.samba.org/samba.git/?p=tprouty%2Fsamba.git;a=commitdiff_plain;h=a14ae0c29d3777bebe98ced4c4871cc4d9afc699

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

a14ae0c29d3777bebe98ced4c4871cc4d9afc699