Merge branch 'bug_7973' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Sat, 23 Mar 2013 02:01:49 +0000 (22:01 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Sat, 23 Mar 2013 02:01:49 +0000 (22:01 -0400)

Trivial merge