Big honkin' merge from head. Sheesh!

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

config/alfresco/repository.properties

@@ -61,6 +61,7 @@ db.username=alfresco
 db.password=alfresco
 db.pool.initial=10
 db.pool.max=20
+db.pool.maxIdleTime=120
 
 # Email configuration
 
@@ -96,6 +97,7 @@ spaces.dictionary.childname=app:dictionary
 spaces.templates.childname=app:space_templates
 spaces.templates.content.childname=app:content_templates
 spaces.templates.email.childname=app:email_templates
+spaces.templates.rss.childname=app:rss_templates
 spaces.savedsearches.childname=app:saved_searches
 spaces.scripts.childname=app:scripts
 
@@ -104,7 +106,21 @@ spaces.scripts.childname=app:scripts
 system.system_container.childname=sys:system
 system.people_container.childname=sys:people
 
+# Folders for storing workflow related info
+
+system.workflow_container.childname=sys:workflow
+
 # Are user names case sensitive?
+# ==============================
+#
+# NOTE: If you are using mysql you must have case sensitive collation
+#
+# You can do this when creating the alfresco database at the start
+# CREATE DATABASE alfresco CHARACTER SET utf8 COLLATION utf8_bin;
+# If you want to do this later this is a dump and load fix as it is done when the database, tables and columns are created.
+#
+# Must other databases are case sensitive by default.
+#
 
 user.name.caseSensitive=false