Merge branch 'bug_8108' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 31 Jan 2013 16:09:00 +0000 (11:09 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 31 Jan 2013 16:09:00 +0000 (11:09 -0500)

Trivial merge