Merge change I0ee370b9 into eclair-mr2

* changes:
  Consistently use Formatter's cached NumberFormat.