Merge remote-tracking branch 'akrabat/feature/layout-consolidation'
authorEvan Coury <me@evancoury.com>
Mon, 30 Jan 2012 02:37:29 +0000 (19:37 -0700)
committerEvan Coury <me@evancoury.com>
Mon, 30 Jan 2012 02:37:29 +0000 (19:37 -0700)

Trivial merge