Merge branch 'bug_8559' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 28 Nov 2012 22:09:43 +0000 (17:09 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 28 Nov 2012 22:09:43 +0000 (17:09 -0500)

Trivial merge