Commit: misc random stuff

[Dom Lachowicz]

I've just committed a bunch of smallish things:

Work-around for 1460
CJK Font Patch
Smallish XHTML fixes