Merge branch 'master' of git://git.koha-community.org/koha
authorLars Wirzenius <lars@catalyst.net.nz>
Thu, 27 May 2010 00:08:06 +0000 (12:08 +1200)
committerLars Wirzenius <lars@catalyst.net.nz>
Thu, 27 May 2010 00:08:06 +0000 (12:08 +1200)

Trivial merge