Merge branch 'bug_9583' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Tue, 12 Feb 2013 13:40:58 +0000 (08:40 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Tue, 12 Feb 2013 13:40:58 +0000 (08:40 -0500)

Trivial merge