Merge branch 'bug_7608' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 15 Feb 2013 12:46:59 +0000 (07:46 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 15 Feb 2013 12:46:59 +0000 (07:46 -0500)

Trivial merge