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

create tag 'DRUPAL-6--1-0-RC2'.

Sprout from DRUPAL-6--1 2010-01-05 01:40:44 UTC Todd Nienkerk <todd_nienkerk@92096.no-reply.drupal.org> 'Fixing undefined function error. Changing output for the upload form. Minor changes to the template file.'
Cherrypick from DRUPAL-6--1 2010-01-06 18:06:13 UTC Shannon [heathen] Lucas <lucas@fourkitchens.com> 'addresses [#674806] and added translation template':
    attachment_links.install
    translations/attachment_links.pot