Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Fri, 15 Aug 2008 10:47:52 +0000 (20:47 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Fri, 15 Aug 2008 10:47:52 +0000 (20:47 +1000)
commitf1df6744f1df1c012fbe57d83fcdfd3060a683c3
treef007f39c87320d71bfe27928422003a6d7a56d69
parentac503b140d6d69b6341be2e80ba535d7cfc7a73d
parent4bdb752cc51c9f41859f1a43bf5721ae616fa230
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
(This used to be commit 3731f7eaea6e5ed89d24e383dae0531cb58d77dc)