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

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

Sprout from DRUPAL-6--2 2011-01-03 14:29:09 UTC Yves Chedemois <yched.drupal@free.fr> '#435520 by yched, sun: Fix text fields rendered as 'n/a' in some cases'
Cherrypick from DRUPAL-6--2 2011-01-07 13:37:55 UTC Yves Chedemois <yched.drupal@free.fr> 'Format changelog before rolling a release':
    CHANGELOG.txt
    includes/content.token.inc
    includes/views/handlers/content_handler_field.inc
    includes/views/handlers/content_handler_field_multiple.inc