Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
authorAndrew Bartlett <abartlet@samba.org>
Mon, 14 Apr 2008 16:01:40 +0000 (18:01 +0200)
committerAndrew Bartlett <abartlet@samba.org>
Mon, 14 Apr 2008 16:01:40 +0000 (18:01 +0200)
commitf610862dc900cb3ddf0f275641bc3b66ad1f3bc4
treebd9ccd099525b517a047df3bf3ef15c453f8e949
parentb191a1953c24545e9dc1869fc33cb29343d4e3f2
parent8dca5b9bbb8706a98ad9a15f1b479be497dd44e7
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet