Merge "enable proxy support in config file"
authorJian-feng ding <jian-feng.ding@intel.com>
Thu, 22 Dec 2011 09:12:02 +0000 (17:12 +0800)
committerGerrit Code Review <gerrit2@gerrit.bj.intel.com>
Thu, 22 Dec 2011 09:12:02 +0000 (17:12 +0800)

Trivial merge