Merge remote-tracking branch 'xiaogaozi/master'
authorTravis Swicegood <development@domain51.com>
Fri, 4 May 2012 21:32:44 +0000 (16:32 -0500)
committerTravis Swicegood <development@domain51.com>
Fri, 4 May 2012 21:33:10 +0000 (16:33 -0500)

Trivial merge