Merge branch 'bug_8977' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 9 Jan 2013 13:18:34 +0000 (08:18 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 9 Jan 2013 13:18:34 +0000 (08:18 -0500)

Trivial merge