Merge change Ie31311fd into eclair-mr2

* changes:
  fix the "right icon" in the titlebar