Merge branch 'translation' of git://git.workbuffer.org/git/koha into to-push
authorGalen Charlton <gmcharlt@gmail.com>
Thu, 21 Oct 2010 21:25:45 +0000 (17:25 -0400)
committerGalen Charlton <gmcharlt@gmail.com>
Thu, 21 Oct 2010 21:25:45 +0000 (17:25 -0400)

Trivial merge