Merge branch 'bug_9952' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Tue, 2 Apr 2013 12:17:40 +0000 (08:17 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Tue, 2 Apr 2013 12:17:40 +0000 (08:17 -0400)

Trivial merge