Include margin in inline block intrinsic width. Fixes [edit] links on wikipedia.
Merge pull request #3404 from glennw/inline-block-fix

Include margin in inline block intrinsic width. Fixes [edit] links on wikipedia. Also improves google homepage.