bitkeeper revision 1.1236.1.75 (4230715amFhBlsGlZ_IAsONxYJw8Dw)

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

tools/python/xen/xend/server/SrvDaemon.py

@@ -15,6 +15,7 @@ import pwd
 import re
 import StringIO
 import traceback
+import time
 
 from twisted.internet import pollreactor
 pollreactor.install()
@@ -518,8 +519,8 @@ class Daemon:
         self.install_child_reaper()
 
         if self.fork_pid(XEND_PID_FILE):
-            #Parent
-            pass
+            #Parent. Sleep to give child time to start.
+            time.sleep(1)
         else:
             # Child
             self.tracing(trace)