Merge change I919c20bb into eclair-mr2

* changes:
  Code clean up.