Merge branch 'bootstrap' into devel
authorGui Chen <gui.chen@intel.com>
Tue, 28 Aug 2012 13:32:06 +0000 (21:32 +0800)
committerGui Chen <gui.chen@intel.com>
Tue, 28 Aug 2012 13:32:06 +0000 (21:32 +0800)
commit69e59d8b14a50aba4e1354c2ec0b58a36a58b533
treeca1ede34891bf9b504067db158f7160a58bf4080
parenta740a5e152a178b01532795cbe4edf376baee37e
parentfd3be60c96ec4a8f39237a0291fbc39d1c856cf8
Merge branch 'bootstrap' into devel

Conflicts:
mic/creator.py

Signed-off-by: Gui Chen <gui.chen@intel.com>