Merge change I129483f8 into eclair-mr2

* changes:
  Optional use of UTF-8 strings in resource bundles