Merge change Ifed529e2 into eclair

* changes:
  Fix widgets