tree 978d47f0488c63699a972888c6e6bb754871fe8b
parent c2ccc98ceb07c009d64b7ee801f8966194510021
parent a0a90b92c94607c04a915d2a47c19e2cc5e85f85
author Anthony Liguori <aliguori@us.ibm.com> 1286841701 -0500
committer Anthony Liguori <aliguori@us.ibm.com> 1286841701 -0500

Merge remote branch 'qmp/for-stable-0.13' into stable-0.13