Merge branch 'bug_8943' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Sun, 31 Mar 2013 12:33:44 +0000 (08:33 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Sun, 31 Mar 2013 12:33:44 +0000 (08:33 -0400)

Trivial merge