Merge commit 'release-3-0-27a' into v3-0-stable
authorGerald (Jerry) Carter <jerry@samba.org>
Wed, 21 Nov 2007 13:38:19 +0000 (07:38 -0600)
committerGerald (Jerry) Carter <jerry@samba.org>
Wed, 21 Nov 2007 13:38:19 +0000 (07:38 -0600)
Resolved Conflicts:

source/VERSION

1  2 
source/VERSION

diff --cc source/VERSION
Simple merge