Merge branch 'bug_10042' into 3.14-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 18 Apr 2013 12:36:24 +0000 (08:36 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 18 Apr 2013 12:36:24 +0000 (08:36 -0400)

Trivial merge