am 0128c250: am 1b15acf7: Merge change I21eb4b87 into eclair-mr2

Merge commit '0128c250e3a81e5d3793126ad82b2ce3c387a4ef'

* commit '0128c250e3a81e5d3793126ad82b2ce3c387a4ef':
  Allow room for descenders in am/pm text.