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

Trivial merge