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