Merge branch 'master' into xen

Merge branch 'master' into xen

Conflicts:

	hw/ide.c
	hw/pc.c
	hw/serial.c
	hw/usb-hid.c
	loader.c
	sysemu.h
	vl.c

Merge was relatively straightforward.  Specific comments follow:

	hw/serial.c
		Have kept the Xen rate limiting rather than
		the qemu version.  The Xen version does an overall
		rate limit but doesn't adjust according to the
		baud rate.  The qemu version is just a maximum
		burst (so no overall capacity limit) but does
		depend on the baud rate.

	vl.c
		Several dummy functions helpfully moved into
		target-* directories; I put them in a new
		i386-dm/machine.c for now.