Merge branch 'bug_8220' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 22 Mar 2013 00:41:37 +0000 (20:41 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 22 Mar 2013 00:41:37 +0000 (20:41 -0400)

Trivial merge