Merge branch 'v4-0-local' of git://git.id10ts.net/samba into v4-0-test
authorJelmer Vernooij <jelmer@samba.org>
Fri, 28 Mar 2008 00:00:48 +0000 (01:00 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Fri, 28 Mar 2008 00:00:48 +0000 (01:00 +0100)
commitb6c61bee649734f6000fbf3fe3736d8c82155ac9
tree39bb5746cb2aa4656f063b193692bf750e8022de
parentcd275862c65542ea1118cfb76d7d1b082427098a
parentee9ad77009ef5e36655a49c41730a4a963ba9d43
Merge branch 'v4-0-local' of git://git.id10ts.net/samba into v4-0-test