Merge branch 'bug_10046' into 3.14-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Sun, 21 Apr 2013 13:37:15 +0000 (09:37 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Sun, 21 Apr 2013 13:37:15 +0000 (09:37 -0400)

Trivial merge