Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
authorAndrew Tridgell <tridge@samba.org>
Fri, 29 Aug 2008 21:38:02 +0000 (07:38 +1000)
committerAndrew Tridgell <tridge@samba.org>
Fri, 29 Aug 2008 21:38:02 +0000 (07:38 +1000)
commitf008c3b6ee324056fd9b63f6151ad6849640c959
tree7c7e31cbfefebe9b2fae39564bb227ed4c9f3531
parent25171f18a4b242b5a731f4ac1eefc51cc82efd74
parentc6b8ba893dd3ed90bca32c0ae89fd33be729c238
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test