Merge branch 'bug_10259' into 3.14-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Sat, 18 May 2013 10:08:00 +0000 (06:08 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Sat, 18 May 2013 10:08:00 +0000 (06:08 -0400)

Trivial merge