tree b150d922f971f5983da8b899c54eab3b9ef9e5e3
parent d03703c81a202cea156811e5dbc8e88627c19986
parent 25d2e3613d159782b66f497184ebdcf3ccb686ab
author Anthony Liguori <aliguori@us.ibm.com> 1287752534 -0500
committer Anthony Liguori <aliguori@us.ibm.com> 1287752534 -0500

Merge remote branch 'qemu-kvm/uq/master' into staging