Merge remote branch 'koha-fbc/k_bug_5203' into master
authorGalen Charlton <gmcharlt@gmail.com>
Wed, 6 Oct 2010 11:04:11 +0000 (07:04 -0400)
committerGalen Charlton <gmcharlt@gmail.com>
Wed, 6 Oct 2010 11:04:22 +0000 (07:04 -0400)
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>

Trivial merge