Merge remote-tracking branch 'erichs/fix_pull_121'
authorTravis Swicegood <development@domain51.com>
Mon, 7 May 2012 23:19:07 +0000 (18:19 -0500)
committerTravis Swicegood <development@domain51.com>
Mon, 7 May 2012 23:19:07 +0000 (18:19 -0500)

Trivial merge