Merge branch '0.4.x' into 0.5.0.x
authorLuke Dashjr <luke-jr+git@utopios.org>
Wed, 4 Apr 2012 19:36:25 +0000 (15:36 -0400)
committerLuke Dashjr <luke-jr+git@utopios.org>
Wed, 4 Apr 2012 19:36:25 +0000 (15:36 -0400)

Trivial merge