Commit bac1dd6a0ff4d4fae4254506d38ae662b7e9dda7

Behdad Esfahbod 2013-05-02T18:52:24

[OTLayout] Refactor a bit more