Merge change I38601c0e into eclair-mr2

* changes:
  Fix the wrong layout in the layout test.