Merge branch 'v4-0-local' of git://git.id10ts.net/samba into v4-0-gmake3
authorJelmer Vernooij <jelmer@samba.org>
Fri, 28 Mar 2008 00:00:13 +0000 (01:00 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Fri, 28 Mar 2008 00:00:13 +0000 (01:00 +0100)
commit237f1cca028881a57f961884f427673907c1535a
tree1f6c905df14fa306e199cbbda9c1191ce62e0858
parent90f76ae99b537c24e8e26fead1d8b857afa0a7a6
parentb2c6ba69a453aaa7cbabb7be7b8c2a05b48a76c4
Merge branch 'v4-0-local' of git://git.id10ts.net/samba into v4-0-gmake3
(This used to be commit 71110c8e7d58f42312938d0a8d0b216cbc313885)