Merge commit 'e962c7f' into 0.5.0.x
authorLuke Dashjr <luke-jr+git@utopios.org>
Sun, 15 Apr 2012 17:23:43 +0000 (13:23 -0400)
committerLuke Dashjr <luke-jr+git@utopios.org>
Sun, 15 Apr 2012 17:23:43 +0000 (13:23 -0400)

Trivial merge