Merge branch 'master' of git://git.uk.xensource.com/xenclient/xen-pq

Conflicts:

	master/series

diff --cc master/series
index 00ca76019c0ec742d45eedc2cedfb8a7d35dfbe3,2482160fd46077af1b25b6e37db1fb77ebd8afbd..84e635cd31b9c07a664f7d3d2cc7f9a6e2046f78
--- 1/master/series
--- 2/master/series
+++ b/master/series
@@@ -30,4 -30,5 +30,6 @@@ filter-igfx-i
  hack-vbe-dont-check-mem
  hp-host-resume-workaround
  cope-with-dead-serial
+ reset-atapi-after-failed-cd-boot
+ fix-build-race
 +vga-edid