Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
authorAndrew Tridgell <tridge@samba.org>
Fri, 18 Apr 2008 13:42:55 +0000 (15:42 +0200)
committerAndrew Tridgell <tridge@samba.org>
Fri, 18 Apr 2008 13:42:55 +0000 (15:42 +0200)
commite2489de8de7d6e4839f29166f1881df3550a502d
tree2fb28a535a9e77eb2a30bd951d52018874b3f34e
parentb2dac6645c3bce45ab2178b9f5b4e017486b5b8e
parent43fc10aaa7c3d50cb9fee5ecab859103aec4a62e
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test