Merge branch 'bug_7938' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Sat, 30 Mar 2013 01:53:45 +0000 (21:53 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Sat, 30 Mar 2013 01:53:45 +0000 (21:53 -0400)

Trivial merge