Merge from HEAD to WCM-DEV2.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3659 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

config/alfresco/repository.properties

@@ -5,6 +5,8 @@ dir.root=./alf_data
 dir.contentstore=${dir.root}/contentstore
 dir.contentstore.deleted=${dir.root}/contentstore.deleted
 
+dir.auditcontentstore=${dir.root}/audit.contentstore
+
 # The location for lucene index files
 
 dir.indexes=${dir.root}/lucene-indexes
@@ -54,6 +56,7 @@ lucene.lock.poll.interval=100
 
 # Database configuration
 
+db.schema.update=true
 db.driver=org.gjt.mm.mysql.Driver
 db.name=alfresco
 db.url=jdbc:mysql:///${db.name}