Merge branch 'v4-0-test' of /home/jelmer/samba4 into v4-0-test
authorJelmer Vernooij <jelmer@samba.org>
Sun, 18 May 2008 17:10:49 +0000 (19:10 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Sun, 18 May 2008 17:10:49 +0000 (19:10 +0200)
commitddfc4380adc46a7c004ebc35da32e491ea39184a
treea7817e9b2eede8803feed9238d71a0ba2ce14ff0
parentb8bbbcab4b58e3c04c37771fe238d57c1f9fbfc2
parent100d3967d3e522027f72bf5071f0b385eea32e74
Merge branch 'v4-0-test' of /home/jelmer/samba4 into v4-0-test
(This used to be commit 201da6d5d05ed624bd9f4bd535969077a3b8b3ba)