Merge branch 'bug_7678' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Tue, 22 Jan 2013 23:35:22 +0000 (18:35 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Tue, 22 Jan 2013 23:35:22 +0000 (18:35 -0500)

Trivial merge