bitkeeper revision 1.1159.170.48 (419cbc3bwAAPKW4Lxcb78C1Npws_tQ)

Merge scramble.cl.cam.ac.uk:/auto/groups/xeno/BK/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/auto/groups/xeno/BK/xen-unstable.bk

xen/Makefile

@@ -2,8 +2,8 @@
 # This is the correct place to edit the build version.
 # All other places this is stored (eg. compile.h) should be autogenerated.
 export XEN_VERSION       = 2
-export XEN_SUBVERSION    = 1
-export XEN_EXTRAVERSION  = "-devel"
+export XEN_SUBVERSION    = 0
+export XEN_EXTRAVERSION  = ""
 
 export BASEDIR          := $(shell pwd)