Merge branch 'v3-0-test' of ssh://jra@git.samba.org/data/git/samba into v3-0-test
authorJeremy Allison <jra@samba.org>
Fri, 6 Jun 2008 22:02:56 +0000 (15:02 -0700)
committerJeremy Allison <jra@samba.org>
Fri, 6 Jun 2008 22:02:56 +0000 (15:02 -0700)
commit7cb46e9e59355bcff032085d7d883441a34d2482
treea4c144e9993776d0b4b5c0d77b18fcd3846d822f
parentf45849448e8a61646b16c8c87e501d1e8c819ccc
parent36729f6f1680310d51f126aa4b7760f11e405a9c
Merge branch 'v3-0-test' of ssh://jra@git.samba.org/data/git/samba into v3-0-test