Merge remote-tracking branch 'weierophinney/feature/view-script-resoultion'
authorEvan Coury <me@evancoury.com>
Fri, 18 May 2012 22:16:56 +0000 (15:16 -0700)
committerEvan Coury <me@evancoury.com>
Fri, 18 May 2012 22:16:56 +0000 (15:16 -0700)

Trivial merge