bitkeeper revision 1.1236.25.10 (42335daeuY-j8gV61kHapguVRal9ig)

Merge firebug.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk
into firebug.cl.cam.ac.uk:/local/scratch/cl349/xen-unstable.bk-2.6.11

diff --cc BitKeeper/etc/logging_ok
index fde76498a42b5a503394b0d43e9c46a508ea5649,05d987fd88a68b384cc456b56aed003366445330..79a776132a96b3ec18ef0d1a80257cd6cd78e065
--- 1/BitKeeper/etc/logging_ok
--- 2/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@@ -19,12 -15,10 +19,13 @@@ cl349@firebug.cl.cam.ac.u
  cl349@freefall.cl.cam.ac.uk
  cl349@labyrinth.cl.cam.ac.uk
  cwc22@centipede.cl.cam.ac.uk
 +cwc22@donkeykong.cl.cam.ac.uk
  djm@kirby.fc.hp.com
+ doogie@brainfood.com
  gm281@boulderdash.cl.cam.ac.uk
  gm281@tetrapod.cl.cam.ac.uk
 +harry@dory.(none)
 +iap10@firebug.cl.cam.ac.uk
  iap10@freefall.cl.cam.ac.uk
  iap10@labyrinth.cl.cam.ac.uk
  iap10@nidd.cl.cam.ac.uk

diff --cc Makefile
Simple merge

diff --cc tools/Makefile
index 26b74babd06adf2e03a6d0c60fec92778ecb9ee3,c582a014d00a545df223bad653145f31c1f10c4c..fe5a7ea3583f73be792fad5046ecefc781088d2d
--- 1/tools/Makefile
--- 2/tools/Makefile
+++ b/tools/Makefile
@@@ -21,17 -19,14 +21,17 @@@ install
        $(MAKE) -C python install
        $(MAKE) -C xfrd install
        $(MAKE) -C sv install
 +      $(MAKE) -C xcs install
 +      $(MAKE) -C ioemu install
  
- clean:
-       $(MAKE) -C check clean
-       $(MAKE) -C libxutil clean
-       $(MAKE) -C libxc clean
-       $(MAKE) -C misc clean
-       $(MAKE) -C examples clean
-       $(MAKE) -C xentrace clean
-       $(MAKE) -C python clean
-       $(MAKE) -C xfrd clean
+ clean build:
+       $(MAKE) -C check $@
+       $(MAKE) -C libxutil $@
+       $(MAKE) -C libxc $@
+       $(MAKE) -C misc $@
+       $(MAKE) -C examples $@
+       $(MAKE) -C xentrace $@
+       $(MAKE) -C python $@
+       $(MAKE) -C xfrd $@
 -
 +      $(MAKE) -C xcs clean
 +      $(MAKE) -C ioemu clean

diff --cc tools/examples/Makefile
Simple merge

diff --cc tools/libxc/Makefile
Simple merge

diff --cc tools/libxutil/Makefile
Simple merge

diff --cc xen/Makefile
Simple merge