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

Trivial merge