Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Fri, 30 May 2008 07:26:42 +0000 (17:26 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Fri, 30 May 2008 07:26:42 +0000 (17:26 +1000)
commit31308caad0a83a487341307e4e810a69c08ff371
tree7e3e7165475a9797e819bba6540a679946e4cfa2
parent75122e88e53aaa9930af85887e939fb329f51e2d
parentb788096add3586d7277efcd3bf5ca7f3a604cb7a
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local