Merge branch 'bug_9461' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 15 Feb 2013 13:44:17 +0000 (08:44 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 15 Feb 2013 13:44:17 +0000 (08:44 -0500)

Trivial merge