Merge branch 'bug_7455' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 1 Nov 2012 14:31:14 +0000 (10:31 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 1 Nov 2012 14:31:14 +0000 (10:31 -0400)

Trivial merge