Merge branch 'bug_10233' into 3.14-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Tue, 14 May 2013 12:17:42 +0000 (08:17 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Tue, 14 May 2013 12:17:42 +0000 (08:17 -0400)

Trivial merge