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

Trivial merge