Merge branch 'bug_8899' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 23 Nov 2012 18:30:32 +0000 (13:30 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 23 Nov 2012 18:30:32 +0000 (13:30 -0500)

Trivial merge