Merge branch 'bug_8979' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Tue, 19 Mar 2013 12:46:38 +0000 (08:46 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Tue, 19 Mar 2013 12:46:38 +0000 (08:46 -0400)

Trivial merge