Merge branch 'master' into stefano

Conflicts:

	intel.c
	vl.c

diff --cc vl.c
index 659c90a982f760dd10dc1674a80664713a076005,1b98273a29bf77a1e8a25db24a063bd012385d1a..18da2d32d347b4bad65c986096135a088952fea2
--- 1/vl.c
--- 2/vl.c
+++ b/vl.c
@@@ -211,7 -211,8 +211,8 @@@ int opengl_enabled = 0
  #endif
  const char *dom0_input = NULL;
  int vga_passthrough = 0;
 -char *intel_output = NULL;
 +int intel_output;
+ int kbd_passthrough = 0;
  static const char *direct_pci;
  static int nb_pci_emulation = 0;
  static char pci_emulation_config_text[MAX_PCI_EMULATION][256];