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

Trivial merge