Merge remote branch 'origin/master'
authorJF Ding <jian-feng.ding@intel.com>
Thu, 27 Oct 2011 09:04:14 +0000 (17:04 +0800)
committerJF Ding <jian-feng.ding@intel.com>
Thu, 27 Oct 2011 09:04:14 +0000 (17:04 +0800)
1  2 
mic/configmgr.py

Simple merge