Merge change I8e1b0fb7 into eclair-mr2

* changes:
  Fix Settings to show versionName instead of versionCode.