Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Fri, 15 Aug 2008 10:47:52 +0000 (20:47 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Fri, 15 Aug 2008 10:47:52 +0000 (20:47 +1000)
commit3731f7eaea6e5ed89d24e383dae0531cb58d77dc
tree99931aaf88a5e2b2265976b8781480236aa029cc
parentb337369d5c86b37d93ee1c62880068e14d6c09f6
parentb4b14b748e6babc93faee23fe8f5c03ec2d25cbb
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local