Merge remote branch 'qmp/for-anthony' into staging
commit9233da785f55c924c5850cd1ce1b7f5f200d631b
authorAnthony Liguori <aliguori@us.ibm.com>
Tue, 30 Nov 2010 21:24:26 +0000 (30 15:24 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Tue, 30 Nov 2010 21:24:26 +0000 (30 15:24 -0600)
tree3fade99ba46241e37c8ec7cb459989f0ec142fe0
parentfd5d5c566af040be15f2cae1b14a47919974453d
parenta6f9dd02f75685934ca52f038b6fcb38b661c283
Merge remote branch 'qmp/for-anthony' into staging