Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
authorJeremy Allison <jra@samba.org>
Fri, 21 Dec 2007 21:14:59 +0000 (13:14 -0800)
committerJeremy Allison <jra@samba.org>
Fri, 21 Dec 2007 21:14:59 +0000 (13:14 -0800)
commit11acca7d3884731491709dd09b7de2edc8bb5811
tree5bc252a366afd93e031320fe58ebee98b7089f11
parentc855de0c05e2e271e2610de67a6d7e3aba52390f
parentad87786c91709d62ee2cbd02c87e59b855e050cc
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test

Conflicts:

source/library-versions.in
source/configure.in
source/library-versions.in