Merge remote branch 'koha-fbc/k_bug_5284' into master
authorGalen Charlton <gmcharlt@gmail.com>
Wed, 6 Oct 2010 17:45:52 +0000 (13:45 -0400)
committerGalen Charlton <gmcharlt@gmail.com>
Wed, 6 Oct 2010 17:46:02 +0000 (13:46 -0400)
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>

Trivial merge