Merge branch 'encukou'
authorEevee <git@veekun.com>
Sat, 2 Apr 2011 00:10:13 +0000 (17:10 -0700)
committerEevee <git@veekun.com>
Sat, 2 Apr 2011 00:10:13 +0000 (17:10 -0700)

Trivial merge