Merge branch '0.4.x' into 0.5.x
authorLuke Dashjr <luke-jr+git@utopios.org>
Fri, 2 Dec 2011 04:22:12 +0000 (23:22 -0500)
committerLuke Dashjr <luke-jr+git@utopios.org>
Fri, 2 Dec 2011 04:22:12 +0000 (23:22 -0500)
(no actual changes)


Trivial merge