Merge branch 'v3-0-stable' into v3-0-test
authorGerald (Jerry) Carter <jerry@samba.org>
Mon, 10 Dec 2007 14:34:15 +0000 (08:34 -0600)
committerGerald (Jerry) Carter <jerry@samba.org>
Mon, 10 Dec 2007 14:34:15 +0000 (08:34 -0600)
commitf5afd08483dec2bd1c53c10550e512e12ebe4ab1
tree3f19fc5b86cfd458e7594b2684f2c5491bf44107
parent9c0590cbca8128a76300d0e5b3f5b8e479d8080f
parente1abd8c2265dd63d5de388e7d8047c80204bb36e
Merge branch 'v3-0-stable' into v3-0-test

Resolved conflicts in source/VERSION.
source/VERSION