This commit was manufactured as part of Drupal's Great Git Migration to

create tag 'DRUPAL-6--1-2'.

Sprout from DRUPAL-6--1 2008-04-26 17:13:01 UTC Nancy Wichmann <nan_wich@bellsouth.net> '#237582 by NancyDru for mwrochna, daneesia - ability to skip text with span element.'
Cherrypick from DRUPAL-6--1 2009-01-20 01:55:36 UTC Nancy Wichmann <nan_wich@bellsouth.net> '#354339 by surge_martin, NancyDru - Exclude current term from links.':
    glossary.js