From: Jake Wires <Jake.Wires@citrix.com>
Date: Tue, 20 Oct 2009 23:26:40 +0000 (-0700)
Subject: Merge branch 'master' of git://git.uk.xensource.com/xenclient/build
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=c36b8fab67a14a61563785afc40dd3b7fa187be8;p=xenclient%2Fbuild.git

Merge branch 'master' of git://git.uk.xensource.com/xenclient/build

Conflicts:
	package/xenclient/Config.in
	package/xenclient/xenclient.mk
---

c36b8fab67a14a61563785afc40dd3b7fa187be8
diff --cc package/xenclient/Config.in
index df95b10,13677f6..609b71f
--- a/package/xenclient/Config.in
+++ b/package/xenclient/Config.in
@@@ -8,6 -8,6 +8,7 @@@ source "package/xenclient/acm/Config.in
  source "package/xenclient/services/Config.in"
  source "package/xenclient/xblanker/Config.in"
  source "package/xenclient/xenaccess/Config.in"
+ source "package/xenclient/vm-introspection-tools/Config.in"
 +source "package/xenclient/ntfsprogs/Config.in"
  source_exists "package/xenclient/extra/Config.in"
  endmenu
diff --cc package/xenclient/xenclient.mk
index b93b237,fa0293b..325b4ec
--- a/package/xenclient/xenclient.mk
+++ b/package/xenclient/xenclient.mk
@@@ -24,5 -24,5 +24,6 @@@ include package/xenclient/services/serv
  include package/xenclient/wifi_backports/wifi_backports.mk
  include package/xenclient/xblanker/xblanker.mk
  include package/xenclient/xenaccess/xenaccess.mk
+ include package/xenclient/vm-introspection-tools/vm-introspection-tools.mk
 +include package/xenclient/ntfsprogs/ntfsprogs.mk
  -include package/xenclient/extra/extra.mk