Merge branch '7.x' of git.drupal.org:project/drupal into 7.x

CHANGELOG.txt

includes/bootstrap.inc

includes/language.inc

modules/block/block.module

modules/block/block.test

modules/color/color.install

modules/color/color.module

modules/file/file.module

modules/locale/locale.admin.inc

modules/locale/locale.module

modules/locale/locale.test

modules/locale/tests/locale_test.module

modules/translation/translation.pages.inc

modules/translation/translation.test