am 4d59d18a: Merge change Ib18a32c1 into eclair

Merge commit '4d59d18abaf5546ab1c2cccd11655073df937c18' into eclair-mr2

* commit '4d59d18abaf5546ab1c2cccd11655073df937c18':
  Minor label change (size -> resolution)