Merge branch 'encukou'
authorEevee <git@veekun.com>
Sun, 13 Mar 2011 22:51:17 +0000 (15:51 -0700)
committerEevee <git@veekun.com>
Sun, 13 Mar 2011 22:51:17 +0000 (15:51 -0700)

Trivial merge