Merge branch 'bug_8664' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 23 Nov 2012 17:12:59 +0000 (12:12 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 23 Nov 2012 17:12:59 +0000 (12:12 -0500)

Trivial merge