Merge "Sync log from oslo"
authorJenkins <jenkins@review.openstack.org>
Thu, 31 Oct 2013 19:02:29 +0000 (19:02 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 31 Oct 2013 19:02:29 +0000 (19:02 +0000)

Trivial merge