Merge branch 'bug_8557' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 28 Nov 2012 23:35:01 +0000 (18:35 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 28 Nov 2012 23:35:01 +0000 (18:35 -0500)

Trivial merge