Merge branch 'bug_9890' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 22 Mar 2013 20:54:11 +0000 (16:54 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 22 Mar 2013 20:54:11 +0000 (16:54 -0400)

Trivial merge