Merge "Update from upstream"

This commit is contained in:
jenkins-bot
2013-01-09 15:31:04 +00:00
committed by Gerrit Code Review
File diff suppressed because one or more lines are too long