Merge branch 'bug_8519' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Sat, 8 Dec 2012 14:45:44 +0000 (09:45 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Sat, 8 Dec 2012 14:45:44 +0000 (09:45 -0500)

Trivial merge