Merge change 2257 into eclair-dev

* changes:
  Moved fast-track to real window, summarize multiple track icons.