Merge remote-tracking branch 'origin/master' into staging
commitbb5df884db32114a4a0129c9927793ebcf7c089a
authorAnthony Liguori <aliguori@us.ibm.com>
Fri, 22 Jul 2011 16:07:08 +0000 (22 11:07 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Fri, 22 Jul 2011 16:07:08 +0000 (22 11:07 -0500)
tree6bba40e28047e7aac76952fef644f4b9bc90f95f
parente07fc405dc0432c712c9e36c70229f0428f86fa1
parent3b8b030a280f3b496602dc7d2ee5c68e480ec10b
Merge remote-tracking branch 'origin/master' into staging