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)
commit7e7c3110734f3e8cb5cf57907c307567c181f3b8
tree59bb672a4c3f29c6ddbca44943b744ba7647d497
parent6e6edc5c33efce5e1b650150852842ae55e88c9e
parentdb17eb76b0d86773d8c9cf6697d1fdc93649f4ee
Merge remote branch 'origin/master'
mic/conf.py