Merge branch 'master' of git://timeoutd.org/jmdict
authornille <nmeyering@gmail.com>
Tue, 24 Feb 2009 17:26:46 +0000 (18:26 +0100)
committernille <nmeyering@gmail.com>
Tue, 24 Feb 2009 17:26:46 +0000 (18:26 +0100)

Trivial merge