Merge "duplicate locale setting under /etc/locale.conf" into devel
authorGui Chen <gui.chen@intel.com>
Thu, 8 May 2014 10:08:22 +0000 (13:08 +0300)
committerGerrit Code Review <gerrit2@otctools.fi.intel.com>
Thu, 8 May 2014 10:08:22 +0000 (13:08 +0300)

Trivial merge