Merge branch '0.5.0.x' into 0.5.x
authorLuke Dashjr <luke-jr+git@utopios.org>
Mon, 2 Apr 2012 13:37:09 +0000 (09:37 -0400)
committerLuke Dashjr <luke-jr+git@utopios.org>
Mon, 2 Apr 2012 13:37:09 +0000 (09:37 -0400)

Trivial merge