Merge branch 'master' of https://github.com/mozilla/servo
Revert "Add initial support for the line-height property. Line height is only based on the tallest box in each line and does not factor in the vertical-alignment. Improves whitespace handling by passing the whitespace state between function invocations."

This reverts commit 7dcff2b5ff83faf44c24c1e5872b0a5dd850b1ae, reversing
changes made to 93eea6b2e87adedf833790d045bf69417ca9b7e3.
Merge pull request #530 from eschweic/master

Revert line height changes