Merge change If4ff28ed into eclair-mr2

* changes:
  Cleanup one of the ListView sample demos.