Merge branch '0.5.0.x' into 0.5.x
authorLuke Dashjr <luke-jr+git@utopios.org>
Wed, 4 Apr 2012 14:30:32 +0000 (10:30 -0400)
committerLuke Dashjr <luke-jr+git@utopios.org>
Wed, 4 Apr 2012 14:30:35 +0000 (10:30 -0400)

Trivial merge