From: kaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Date: Thu, 10 Mar 2005 18:15:14 +0000 (+0000)
Subject: bitkeeper revision 1.1236.25.2 (42308eb24QS1I9sZRsloBYf2N3-6vA)
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~17857^2~52^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=dac8c36dc59c9d6e2c6c3ea70ce692cfe0349154;p=xen.git

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
---

dac8c36dc59c9d6e2c6c3ea70ce692cfe0349154
diff --cc .hgtags
index 09382d2d5f,35aefe6fd9..f6001e15b5
--- a/.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