Merge change If5b0b6fa into eclair-mr2

* changes:
  Fixed class paths in layout xml files