Merge remote-tracking branch 'erichs/master'
authorTravis Swicegood <development@domain51.com>
Sat, 28 Apr 2012 17:08:58 +0000 (12:08 -0500)
committerTravis Swicegood <development@domain51.com>
Sat, 28 Apr 2012 17:08:58 +0000 (12:08 -0500)

Trivial merge