Merge "Support general configuration file"
authorQiLiang <liangqi1@huawei.com>
Thu, 15 Oct 2015 01:38:55 +0000 (01:38 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Thu, 15 Oct 2015 01:38:56 +0000 (01:38 +0000)

Trivial merge