]> xenbits.xensource.com Git - qemu-xen-4.2-testing.git/commitdiff
Merge remote branch 'kwolf/for-anthony' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Thu, 7 Apr 2011 14:56:09 +0000 (09:56 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Thu, 7 Apr 2011 14:56:09 +0000 (09:56 -0500)

Trivial merge