Merge remote-tracking branch 'refs/remotes/gandaro/369-thread-gettext'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Thu, 26 Jul 2012 16:09:52 +0000 (11:09 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Thu, 26 Jul 2012 16:09:52 +0000 (11:09 -0500)

Trivial merge