Merge branch 'v3-3-test' of ssh://jra@git.samba.org/data/git/samba into v3-3-test
authorJeremy Allison <jra@samba.org>
Tue, 10 Mar 2009 23:53:47 +0000 (16:53 -0700)
committerJeremy Allison <jra@samba.org>
Tue, 10 Mar 2009 23:53:47 +0000 (16:53 -0700)
commit8b9168fed2c1a16745d3f6d6c69b1ad87ec0515d
treef9ab222886198600acf6fb434961a3fb2987a8cf
parent0999366b6b36f3084870af0375d686b0cbaae698
parentc5e1900879411cf240ddb4c1dcb11e645cbcb03e
Merge branch 'v3-3-test' of ssh://jra@git.samba.org/data/git/samba into v3-3-test