Merge remote-tracking branch 'erichs/fasd_fix'
authorTravis Swicegood <development@domain51.com>
Thu, 17 May 2012 21:38:15 +0000 (16:38 -0500)
committerTravis Swicegood <development@domain51.com>
Thu, 17 May 2012 21:38:15 +0000 (16:38 -0500)

Trivial merge