Merge remote-tracking branch 'Thinkscape/master'
authorEvan Coury <me@evancoury.com>
Thu, 26 Jul 2012 13:35:54 +0000 (06:35 -0700)
committerEvan Coury <me@evancoury.com>
Thu, 26 Jul 2012 13:35:54 +0000 (06:35 -0700)
PR #95


Trivial merge