Merge "conf.py: deal siteconf when set in init"
authorQiang Zhang <qiang.z.zhang@intel.com>
Fri, 16 Dec 2011 09:32:34 +0000 (17:32 +0800)
committerGerrit Code Review <gerrit2@gerrit.bj.intel.com>
Fri, 16 Dec 2011 09:32:34 +0000 (17:32 +0800)
1  2 
mic/conf.py

diff --cc mic/conf.py
Simple merge