Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
authorAndrew Tridgell <tridge@samba.org>
Fri, 8 Feb 2008 03:13:48 +0000 (14:13 +1100)
committerAndrew Tridgell <tridge@samba.org>
Fri, 8 Feb 2008 03:13:48 +0000 (14:13 +1100)
commit9e681efdf0023cc835353befc9c31e931586ebd7
tree253096ad6a47bd782a8e9a9c81e792fe6ce408ad
parent77dab7f8579132468627fb2bb4641ccdf242dd11
parentbbf8aca01daeb4519ee12ff1eadf26598dc7a747
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
(This used to be commit fd9cc4eb5afae8b255e753d480190b490cd3f7ab)