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)
(This used to be commit 593d855128d4119c21b2b15bfb9369b760504f86)


Trivial merge