Merge branch 'bug_10049' into 3.14-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Sun, 21 Apr 2013 14:00:43 +0000 (10:00 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Sun, 21 Apr 2013 14:00:43 +0000 (10:00 -0400)

Trivial merge