Merge branch 'bug_8883' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 16 Jan 2013 01:05:02 +0000 (20:05 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 16 Jan 2013 01:05:02 +0000 (20:05 -0500)

Trivial merge