tree 7d7185e9edd5bcf30ea38760d2a7f12fd21bb1c0
parent 9f5a1fae7ee1a7c66462e5b8e9d21552d4dc5027
parent a6c4d36425871fafc55ce3937bebd05e86f5ea81
author Anthony Liguori <aliguori@us.ibm.com> 1278423077 -0500
committer Anthony Liguori <aliguori@us.ibm.com> 1278423077 -0500

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