Merge libxenstat and xentop.

diff --cc Config.mk
index 76180e6b26c7d9e5e0ce82e6b49c8bfc3c0f846d,14c1f4e7e8166565d337eecccf91fecb3bdbe38b..06d569851cede6a126c5446404cb69cd2536038d
--- 1/Config.mk
--- 2/Config.mk
+++ b/Config.mk
@@@ -36,10 -37,5 +37,14 @@@ CFLAGS += $(foreach i, $(EXTRA_INCLUDES
  # Choose the best mirror to download linux kernel
  KERNEL_REPO = http://www.kernel.org
  
 +# ACM_USE_SECURITY_POLICY is set to security policy of Xen
 +# Supported models are:
 +#     ACM_NULL_POLICY (ACM will not be built with this policy)
 +#     ACM_CHINESE_WALL_POLICY
 +#     ACM_SIMPLE_TYPE_ENFORCEMENT_POLICY
 +#     ACM_CHINESE_WALL_AND_SIMPLE_TYPE_ENFORCEMENT_POLICY
 +ACM_USE_SECURITY_POLICY ?= ACM_NULL_POLICY
++
+ # Optional components
+ XENSTAT_XENTOP ?= y
++

diff --cc tools/python/xen/xm/main.py
Simple merge