Merge "fix some grep statement error in conf module,test ok in ubuntu 15.04" into...
authoradmin <yuhuan.yang@samsung.com>
Thu, 9 Jul 2015 20:54:19 +0000 (04:54 +0800)
committerGerrit Code Review <root@liupp-HP-Compaq-Pro-6380-MT>
Thu, 9 Jul 2015 20:54:19 +0000 (04:54 +0800)

Trivial merge