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)
commitfd9cc4eb5afae8b255e753d480190b490cd3f7ab
treedb40ebb9c3caeb3c98194743c47b9e15c887f71d
parentb3e60a388d338ef90540007239e88563cb9ba27a
parentc3098d5c52505e143a6ce498273a5ce6a66220b0
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test