Merge change Id43181f2 into eclair

* changes:
  Fix disabled text color in choice dialogs.