Merge branch 'v3-0-test' of ssh://jra@git.samba.org/data/git/samba into v3-0-test
commitf5742c1f3980ae216fc17005e7e035f2b5f535a5
authorJeremy Allison <jra@samba.org>
Mon, 24 Nov 2008 23:35:12 +0000 (24 15:35 -0800)
committerJeremy Allison <jra@samba.org>
Mon, 24 Nov 2008 23:35:12 +0000 (24 15:35 -0800)
tree54a331388b06c12f6e522a0a2d5819a7d005891d
parent92f3ba8e20bd4a5a2afdd13feb5519d723784274
parent114b94f86e15d482f3b39912f28eb72b66b36bc8
Merge branch 'v3-0-test' of ssh://jra@git.samba.org/data/git/samba into v3-0-test