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

Conflicts:
	hw/pc.c

diff --cc Makefile.objs
Simple merge

diff --cc hw/pc.c
index 14911297eae745f0ef806b1a195fc3eb35f08b91,6e7c4689061751f05aeb44ab301a1a738f10da9a..0f7d330609ac9b1c9c28a56422d0ce928d84bd52
--- 1/hw/pc.c
--- 2/hw/pc.c
+++ b/hw/pc.c
@@@ -35,7 -35,7 +35,8 @@@
  #include "elf.h"
  #include "multiboot.h"
  #include "mc146818rtc.h"
 +#include "sysbus.h"
+ #include "sysemu.h"
  
  /* output Bochs bios info messages */
  //#define DEBUG_BIOS

diff --cc hw/qdev.c
Simple merge

diff --cc monitor.c
Simple merge

diff --cc sysemu.h
Simple merge

diff --cc vl.c
Simple merge