Merge remote branch 'origin/master'
authorJF Ding <jian-feng.ding@intel.com>
Mon, 19 Dec 2011 01:56:20 +0000 (09:56 +0800)
committerJF Ding <jian-feng.ding@intel.com>
Mon, 19 Dec 2011 01:56:20 +0000 (09:56 +0800)
1  2 
mic/conf.py

diff --cc mic/conf.py
Simple merge