Merge commit 'biblibre/3.2_community' into to-push
authorGalen Charlton <gmcharlt@gmail.com>
Tue, 26 Jan 2010 19:46:05 +0000 (14:46 -0500)
committerGalen Charlton <gmcharlt@gmail.com>
Tue, 26 Jan 2010 19:46:10 +0000 (14:46 -0500)
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>

Trivial merge