Merge branch 'bug_10134' into 3.14-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Sun, 12 May 2013 14:05:40 +0000 (10:05 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Sun, 12 May 2013 14:05:40 +0000 (10:05 -0400)

Trivial merge