aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>2006-03-23 14:26:38 +0100
committeremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>2006-03-23 14:26:38 +0100
commit64444a69821e1c2d9cb1dff2152d45b4a24f665a (patch)
treed496e08ebfd3e1aa18c602a2447f50371a0e61af
parent2a07425a76ad5d78aee7e5be078b10af413f04dd (diff)
downloadxen-64444a69821e1c2d9cb1dff2152d45b4a24f665a.tar.gz
xen-64444a69821e1c2d9cb1dff2152d45b4a24f665a.tar.bz2
xen-64444a69821e1c2d9cb1dff2152d45b4a24f665a.zip
Merged.
-rw-r--r--tools/python/xen/util/xmlrpclib2.py1
-rwxr-xr-x[-rw-r--r--]tools/xm-test/ramdisk/skel/etc/init.d/rcS0
2 files changed, 1 insertions, 0 deletions
diff --git a/tools/python/xen/util/xmlrpclib2.py b/tools/python/xen/util/xmlrpclib2.py
index 794a003b5d..f23c294e0c 100644
--- a/tools/python/xen/util/xmlrpclib2.py
+++ b/tools/python/xen/util/xmlrpclib2.py
@@ -13,6 +13,7 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#============================================================================
# Copyright (C) 2006 Anthony Liguori <aliguori@us.ibm.com>
+# Copyright (C) 2006 XenSource Ltd.
#============================================================================
"""
diff --git a/tools/xm-test/ramdisk/skel/etc/init.d/rcS b/tools/xm-test/ramdisk/skel/etc/init.d/rcS
index b3a92109e9..b3a92109e9 100644..100755
--- a/tools/xm-test/ramdisk/skel/etc/init.d/rcS
+++ b/tools/xm-test/ramdisk/skel/etc/init.d/rcS