Merge branch 'bug_8784' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 8 Nov 2012 17:39:47 +0000 (12:39 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 8 Nov 2012 17:39:47 +0000 (12:39 -0500)

Trivial merge