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

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

diff --cc package/xenclient/Config.in
index df95b107bc667db2d469009753dcea0e5332e92c,13677f65bb7409ac522718d653bae9657d6ec5b0..609b71fc1d93db866071f40822f375b4fceb6aed
--- 1/package/xenclient/Config.in
--- 2/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 b93b23762cc0e513b98f2e769fb5b5209c4f1105,fa0293bc7b982c0b566d08bb05188c7d556be9f4..325b4ecaac42b77da8a18604f4adbaeda2745c8a
--- 1/package/xenclient/xenclient.mk
--- 2/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