Merge branch 'bug_10103' into 3.14-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 26 Apr 2013 22:17:09 +0000 (18:17 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 26 Apr 2013 22:17:09 +0000 (18:17 -0400)

Trivial merge