Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-test
authorAlexander Bokovoy <ab@samba.org>
Thu, 17 Jan 2008 04:26:12 +0000 (07:26 +0300)
committerAlexander Bokovoy <ab@samba.org>
Thu, 17 Jan 2008 04:26:12 +0000 (07:26 +0300)
commit4256f8e093e81fbc2c1afd8f823725ae286945ce
tree0f56a129c6f4644543ecadbb8887f5628a1a8f11
parentb01f34141509c90b12003786957790866c286cba
parentdf3c4648399f8d62ff6fe0013be8b89abc18f0f0
Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-test