Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
authorJeremy Allison <jra@samba.org>
Thu, 29 Nov 2007 17:48:33 +0000 (09:48 -0800)
committerJeremy Allison <jra@samba.org>
Thu, 29 Nov 2007 17:48:33 +0000 (09:48 -0800)
commitce2844f30de231b8d1c45393f4af73ebe53680ed
tree02c78d5c85a3f6bb51ca28cdc3e5bc37b0c561d6
parenteced14c6e698191f41f7f861ed1c71b2c8414866
parent25a6a677df156d0035c62d2fa86c7ba234333297
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
(This used to be commit aff5a52136b85fe82c4acb08d12009187d1fe6c7)