Merge branch 'bug_10230' into 3.14-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Sun, 19 May 2013 12:41:05 +0000 (08:41 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Sun, 19 May 2013 12:41:05 +0000 (08:41 -0400)

Trivial merge