Merge change I21eb4b87 into eclair-mr2

* changes:
  Allow room for descenders in am/pm text.