Merge branch '0.5.0.x' into 0.5.x
authorLuke Dashjr <luke-jr+git@utopios.org>
Sun, 25 Dec 2011 14:56:55 +0000 (09:56 -0500)
committerLuke Dashjr <luke-jr+git@utopios.org>
Sun, 25 Dec 2011 14:56:55 +0000 (09:56 -0500)

Trivial merge