tree cc99327c9a0d496ed0c400a31c919b517f9d09f4
parent e0c8a796d522b80c21b005a19610829c4be2154f
parent a18b2ce2ed9dc747c2ebab5a220517624e4ff3df
author Anthony Liguori <aliguori@us.ibm.com> 1286304889 -0500
committer Anthony Liguori <aliguori@us.ibm.com> 1286304889 -0500

Merge remote branch 'qmp/for-anthony' into staging