Merge branch 'v3-3-test' of ssh://jra@git.samba.org/data/git/samba into v3-3-test
authorJeremy Allison <jra@samba.org>
Thu, 10 Jul 2008 22:25:40 +0000 (15:25 -0700)
committerJeremy Allison <jra@samba.org>
Thu, 10 Jul 2008 22:25:40 +0000 (15:25 -0700)
commitd9b6bf746b42a667a3f8d99bf0e6489e3f3c8149
treebf02b871ba8f7d83af251686a1a8321909daa820
parent55f676550a909fddfb3b79a4aaa7aef4286dcd11
parent94389c97e5fa66fc91e84fdf212783b24e4a8107
Merge branch 'v3-3-test' of ssh://jra@git.samba.org/data/git/samba into v3-3-test
(This used to be commit 593d855128d4119c21b2b15bfb9369b760504f86)