Merge branch 'bug_8758' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 23 Nov 2012 16:44:55 +0000 (11:44 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 23 Nov 2012 16:44:55 +0000 (11:44 -0500)

Trivial merge