Merge remote-tracking branch 'weierophinney/feature/view-layer'
authorEvan Coury <me@evancoury.com>
Wed, 22 Feb 2012 19:45:03 +0000 (12:45 -0700)
committerEvan Coury <me@evancoury.com>
Wed, 22 Feb 2012 19:45:03 +0000 (12:45 -0700)

Trivial merge