Merge branch 'bug_9332' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 8 Feb 2013 14:23:53 +0000 (09:23 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 8 Feb 2013 14:23:53 +0000 (09:23 -0500)

Trivial merge