Debian upgrade to xorg 7 breaks fonts

If you use debian sid, and you upgraded to xserver-xorg 7.0.14, and you then found that emacs in graphical mode was useless due to broken fonts, the solution is this:

1. edit /etc/X11/xorg.conf (remember that you can use emacs within a terminal with emacs -nw)
2. Replace /usr/lib/X11/fonts with /usr/share/fonts/X11/
3. As root, run dpkg-reconfigure x-ttcidfont-conf
4. Restart X