Merge branch 'bug_10079' into 3.14-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Mon, 13 May 2013 01:06:19 +0000 (21:06 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Mon, 13 May 2013 01:06:19 +0000 (21:06 -0400)

Trivial merge