Merge branch 'future' into agent_future

author Luc Yriarte <luc.yriarte@intel.com>

Mon, 3 Jun 2013 14:43:59 +0000 (16:43 +0200)

committer Luc Yriarte <luc.yriarte@intel.com>

Mon, 3 Jun 2013 14:43:59 +0000 (16:43 +0200)
author Luc Yriarte <luc.yriarte@intel.com>
Mon, 3 Jun 2013 14:43:59 +0000 (16:43 +0200)
committer Luc Yriarte <luc.yriarte@intel.com>
Mon, 3 Jun 2013 14:43:59 +0000 (16:43 +0200)
diff --cc cloudeebus/cloudeebus.js
Simple merge
diff --cc cloudeebus/cloudeebus.py
Simple merge
diff --cc setup.py
Simple merge
author	Luc Yriarte <luc.yriarte@intel.com>
	Mon, 3 Jun 2013 14:43:59 +0000 (16:43 +0200)
committer	Luc Yriarte <luc.yriarte@intel.com>
	Mon, 3 Jun 2013 14:43:59 +0000 (16:43 +0200)
		1	2
cloudeebus/cloudeebus.js	patch \|	diff1 \|	diff2 \|	blob \| history
cloudeebus/cloudeebus.py	patch \|	diff1 \|	diff2 \|	blob \| history
setup.py	patch \|	diff1 \|	diff2 \|	blob \| history