bitkeeper revision 1.1236.25.2 (42308eb24QS1I9sZRsloBYf2N3-6vA)

Merge firebug.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into firebug.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk

diff --cc .hgtags
index 09382d2d5f7cf9e116e8ed8951eef1a88833e947,35aefe6fd90156506a28daaf5b48da57e17c1e52..f6001e15b57ea097824200c4eff776abc5fa5f5b
--- 1/.hgtags
--- 2/.hgtags
+++ b/.hgtags
@@@ -1,8 -1,7 +1,9 @@@
  42882b3e0dda89f3a8ec00da568f86e9b3c230f1 RELEASE-2.0.0
  475a162b66e2c19b1e9468b234a4ba705334905e RELEASE-2.0.1
 -82ba8bd1ceb2e03af769775fb8bc890dcab04f72 RELEASE-2.0.3
 +dc2f08429f17e6614fd2f1ab88cc09ca0a850f32 RELEASE-2.0.2
 +6e1bbc13911751efa0b1c018425c1b085820fa02 RELEASE-2.0.3
 +fb875591fd72e15c31879c0e9034d99b80225595 RELEASE-2.0.4
+ 1a522944f76540ea9d73fcc1b0d13d0f670183f0 RELEASE-2.0.5
  487b2ee37d1cecb5f3e7a546b05ad097a0226f2f beta1
  3d330e41f41ce1bc118c02346e18949ad5d67f6b latest-semistable
  30c521db4c71960b0cf1d9c9e1b658e77b535a3e latest-stable

diff --cc xen/include/public/io/domain_controller.h
Simple merge