Merge branch 'v3-0-test' of ssh://jra@git.samba.org/data/git/samba into v3-0-test
authorJeremy Allison <jra@samba.org>
Mon, 30 Jun 2008 16:16:15 +0000 (09:16 -0700)
committerJeremy Allison <jra@samba.org>
Mon, 30 Jun 2008 16:16:15 +0000 (09:16 -0700)
commitc7e53dfeae88569fec3eeed0b88f545a1b956ccb
tree31ffa6c7aa9b7a3f6adf6ead7a7756667cfe219d
parent23d199fc736a8c053c16830c75d26a6ce5b84b2b
parent730af199e62de52a928179b3a6d280ddaba54d50
Merge branch 'v3-0-test' of ssh://jra@git.samba.org/data/git/samba into v3-0-test