Comment 9 for bug 512698

Adi's branch and another were merged into production-devel (through db-stable, I suppose) together. To revert, I'm using:

    bzr merge . -r 7675.2450.59..7675.2450.58

This produced one strange conflict on the inclusion of event-key.js in base-layout-macros.pt. One version of the text included that, the other didn't. I think I'm erring on the safe side by keeping it in.