Merge branch 'translation' of git://git.workbuffer.org/git/koha into to-push
authorGalen Charlton <gmcharlt@gmail.com>
Fri, 3 Sep 2010 14:35:40 +0000 (10:35 -0400)
committerGalen Charlton <gmcharlt@gmail.com>
Fri, 3 Sep 2010 14:36:39 +0000 (10:36 -0400)
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>

Trivial merge