Merge branch 'bug_8401' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 18 Jan 2013 01:55:47 +0000 (20:55 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 18 Jan 2013 01:55:47 +0000 (20:55 -0500)

Trivial merge