tree ececed210e9e677772df92de915d280e4b1f4d34
parent cfe7bb19d2e717c4ad763879515a8b8bd1ca19c5
parent e3d4d25206a13ca48936e4357a53591997ce6d57
author Anthony Liguori <aliguori@us.ibm.com> 1311344633 -0500
committer Anthony Liguori <aliguori@us.ibm.com> 1311344633 -0500

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