Merge branch 'bug_9587' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Sun, 24 Feb 2013 15:18:54 +0000 (10:18 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Sun, 24 Feb 2013 15:18:54 +0000 (10:18 -0500)

Trivial merge