Merge remote branch 'koha-fbc/k_bug_5182' into to-push
authorGalen Charlton <gmcharlt@gmail.com>
Tue, 28 Sep 2010 13:08:48 +0000 (09:08 -0400)
committerGalen Charlton <gmcharlt@gmail.com>
Tue, 28 Sep 2010 13:08:55 +0000 (09:08 -0400)
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>

Trivial merge