Merge branch 'v3-3-test' of ssh://jra@git.samba.org/data/git/samba into v3-3-test
commit405a4e1eeebcec35801e3072c9db627c7b925c61
authorJeremy Allison <jra@samba.org>
Thu, 25 Sep 2008 17:07:23 +0000 (25 10:07 -0700)
committerJeremy Allison <jra@samba.org>
Thu, 25 Sep 2008 17:07:23 +0000 (25 10:07 -0700)
treeacdcc768e0fd42d6c9d0a9e34e38fd95f107d17d
parent18cf398870e4d7cb336c9cf50f863611862af874
parent701b9f34c986283fdead9ddd42147dd49d5e481e
Merge branch 'v3-3-test' of ssh://jra@git.samba.org/data/git/samba into v3-3-test