Merge branch 'bug_8942' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 31 Jan 2013 16:01:36 +0000 (11:01 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 31 Jan 2013 16:01:36 +0000 (11:01 -0500)

Trivial merge