Merge branch 'v3-0-test' of ssh://jra@git.samba.org/data/git/samba into v3-0-test
authorJeremy Allison <jra@samba.org>
Sat, 5 Jan 2008 01:15:50 +0000 (17:15 -0800)
committerJeremy Allison <jra@samba.org>
Sat, 5 Jan 2008 01:15:50 +0000 (17:15 -0800)
commitb3bb276682a2202b6cb1b6f8628cfd7de302f6c6
tree64ae1b5e995aa26662801ab571a92e60e4ab9122
parent8265f4dc604584d92632db49a9fa9352ad9cd457
parent6f57b52a5e314747be1c5f51c7264724523fff00
Merge branch 'v3-0-test' of ssh://jra@git.samba.org/data/git/samba into v3-0-test