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)
commit1e5133f0aa9864c0592fe0525b85c82251767a7a
treea39de7efa3dce079ebd3d98e05f38064ddb06027
parent98cb89fe75656738a8d857fdff6ace3d68e64485
parent62322a8be147320d76d3e7534f940f482c8d8708
Merge "conf.py: deal siteconf when set in init"
mic/conf.py