Merge "Fix replacing of keys in config manager" into devel
authorQiang Z Zhang <qiang.z.zhang@intel.com>
Mon, 27 Aug 2012 06:30:34 +0000 (23:30 -0700)
committerGerrit Code Review <gerrit2@otctools.jf.intel.com>
Mon, 27 Aug 2012 06:30:34 +0000 (23:30 -0700)

Trivial merge