Merge branch 'v3-3-test' of ssh://jra@git.samba.org/data/git/samba into v3-3-test
authorJeremy Allison <jra@samba.org>
Fri, 29 Aug 2008 16:29:26 +0000 (09:29 -0700)
committerJeremy Allison <jra@samba.org>
Fri, 29 Aug 2008 16:29:26 +0000 (09:29 -0700)
commitad6c85f4cbfdcfab32a95250550b22acf1084498
tree70ad90abb1f631fe8869387ca1dd9e48d9ec38b8
parent21d067c5dbf1e5b7233e9af9c60df25403f79afb
parent2fa3bf836cfa7108e4f47314c58a70218f8cf31a
Merge branch 'v3-3-test' of ssh://jra@git.samba.org/data/git/samba into v3-3-test