Only for the xft branch
Traditional fonts and XFT support are currently currently mutually exclusive at compile-time. While XFT should support a superset of the fonts available through the traditional API, depending on configuration this could mean existing users would be greeted with changed fonts on upgrade. We need to do something to make that transition smoother.