Merge branch 'bug_9980' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Sun, 7 Apr 2013 16:15:11 +0000 (12:15 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Sun, 7 Apr 2013 16:15:11 +0000 (12:15 -0400)

Trivial merge