Merge branch 'bug_10176' into 3.14-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Mon, 6 May 2013 12:22:39 +0000 (08:22 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Mon, 6 May 2013 12:22:39 +0000 (08:22 -0400)

Trivial merge