Merge branch 'bug_8682' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Sun, 24 Feb 2013 15:10:32 +0000 (10:10 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Sun, 24 Feb 2013 15:10:32 +0000 (10:10 -0500)

Trivial merge