Merge branch 'bug_9767' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 8 Mar 2013 12:00:37 +0000 (07:00 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 8 Mar 2013 12:00:37 +0000 (07:00 -0500)

Trivial merge