tree 8e645fa4dc1be00eb06df8cab7a0501a64cffe55
parent 93e0597ef9fa266756c30e61fafe4b70fc7ce6a6
parent 37628f11c6b190ebb3082938868aadb23942ee3a
author Anthony Liguori <aliguori@us.ibm.com> 1307553384 -0500
committer Anthony Liguori <aliguori@us.ibm.com> 1307553384 -0500

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