Merge remote-tracking branch 'mdroth/qga-pull-3-26-12' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 26 Mar 2012 20:17:51 +0000 (15:17 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 26 Mar 2012 20:17:51 +0000 (15:17 -0500)
commit8a22565b7c2d1920b02b94e7a8021c65895a3a22
treea62c3dd11ed66a14e76e14e186aa6b86b8f45450
parent29b18b7a53c0b5053e895947b0b9008120632f9b
parente72c3f2ed9c4fe482ebe34d1079a9ebb8baca552
Merge remote-tracking branch 'mdroth/qga-pull-3-26-12' into staging

* mdroth/qga-pull-3-26-12:
  qemu-ga: fix bsd build, and re-org linux-specific implementations