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)
commit0cffe980495c718494c7a879bfe5939c62e908ac
tree56ad819c0bd6b1ac147d52d17be085e8f9e9927f
parent4eb694389c88dd33f5ebea78c11ca1cb108357d2
parentb2c6ba69a453aaa7cbabb7be7b8c2a05b48a76c4
Merge branch 'v4-0-local' of git://git.id10ts.net/samba into v4-0-test
(This used to be commit b6c61bee649734f6000fbf3fe3736d8c82155ac9)