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)
commit3d01248f63d0d476c16236453983ffe759d0b2c2
treefd8d2ee96ab37c87738c4c706200084fc71008b9
parent9f5897e28dfa0d0563cd2568b4bedc601681e41b
parent5f6b301f92e9e9d5ee1dab9ef8eca2cc77e12941
Merge branch 'v3-3-test' of ssh://jra@git.samba.org/data/git/samba into v3-3-test