Merge branch 'bug_8712' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 27 Dec 2012 23:40:45 +0000 (18:40 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 27 Dec 2012 23:40:45 +0000 (18:40 -0500)

Trivial merge