Comment 2 for bug 758667

> I've got a candidate fix for the line height/vertical-align problem, but my branch is a mess so it will take me a bit to post.

You can always create another branch for this change and leave your normal branch alone. Check out trunk to another directory on your computer. Make the changes. Push them up to another branch.