Merge branch 'v3-3-test' of ssh://jra@git.samba.org/data/git/samba into v3-3-test
commit9075c5f2ada8f96ae8d6cbcfc36663969e9bf34f
authorJeremy Allison <jra@samba.org>
Wed, 25 Jun 2008 22:24:18 +0000 (25 15:24 -0700)
committerJeremy Allison <jra@samba.org>
Wed, 25 Jun 2008 22:24:18 +0000 (25 15:24 -0700)
treef40cd10fdae4d1b97a74e0a620306080806e10ea
parent77b99530e0ce0ab0f335d8b22774548d30690550
parentb90ae343722eb73c5874d875aa439e4ef92ed06a
Merge branch 'v3-3-test' of ssh://jra@git.samba.org/data/git/samba into v3-3-test