Merge branch 'v3-3-test' of ssh://jra@git.samba.org/data/git/samba into v3-3-test
authorJeremy Allison <jra@samba.org>
Thu, 21 Aug 2008 22:27:45 +0000 (15:27 -0700)
committerJeremy Allison <jra@samba.org>
Thu, 21 Aug 2008 22:27:45 +0000 (15:27 -0700)
commit15e8df7dd619c70f1360585a383c131708ce0ceb
treea83eb71f2c7c4b685a547b7f878bab839b917d03
parentd0e6c07316aa8ed6d54df2050fbee252f5d2e4f3
parent6fc73f4e5e11c5784687015f10d9247412f0c8d4
Merge branch 'v3-3-test' of ssh://jra@git.samba.org/data/git/samba into v3-3-test