Merge branch 'v3-3-test' of ssh://jra@git.samba.org/data/git/samba into v3-3-test
authorJeremy Allison <jra@samba.org>
Fri, 30 May 2008 17:09:22 +0000 (10:09 -0700)
committerJeremy Allison <jra@samba.org>
Fri, 30 May 2008 17:09:22 +0000 (10:09 -0700)
commita991c5a7c30253fa36e1ee65fb717d62acf3a806
treef744dcbdef7864a1f5915564bde3e11e133a1ecd
parent2e9136e085f9a88741c594b44037b2f86474882f
parent3e20aeb18e418a5a1a7821fd8c3f0d0bc5169489
Merge branch 'v3-3-test' of ssh://jra@git.samba.org/data/git/samba into v3-3-test
(This used to be commit 3d01248f63d0d476c16236453983ffe759d0b2c2)