Merged from trunk

etc/log-processor.conf-sample

@@ -54,3 +54,4 @@ processable = false
 # devices = /srv/node
 # mount_check = true
 # user = swift
+# metadata_keys = comma separated list of user metadata keys to be collected

etc/proxy-server.conf-sample

@@ -45,6 +45,9 @@ use = egg:swift#proxy
 # makes for quicker posts; but since the container metadata isn't updated in
 # this mode, features like container sync won't be able to sync posts.
 # object_post_as_copy = true
+# If set to 'true' authorized accounts that do not yet exist within the Swift
+# cluster will be automatically created.
+# account_autocreate = false
 
 [filter:tempauth]
 use = egg:swift#tempauth