Merge branch 'bug_8984' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 4 Jan 2013 13:40:00 +0000 (08:40 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 4 Jan 2013 13:40:00 +0000 (08:40 -0500)

Trivial merge