Merge remote-tracking branch 'weierophinney/feature/view-layer'
authorEvan Coury <me@evancoury.com>
Wed, 29 Feb 2012 14:31:33 +0000 (07:31 -0700)
committerEvan Coury <me@evancoury.com>
Wed, 29 Feb 2012 14:31:33 +0000 (07:31 -0700)

Trivial merge