Merge branch 'bug_10058' into 3.14-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Sat, 20 Apr 2013 02:57:37 +0000 (22:57 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Sat, 20 Apr 2013 02:57:37 +0000 (22:57 -0400)

Trivial merge