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

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

Sprout from DRUPAL-6--2 2009-01-28 10:17:09 UTC Tom Bigelajzen <public@tombigel.com> '* Cleaned up page.tpl, main-nav and header-blocks are now not created if empty.'
Cherrypick from DRUPAL-6--2 2009-02-22 23:07:50 UTC Tom Bigelajzen <public@tombigel.com> 'fixed 2 typos:':
    CHANGELOG.txt
    template.php
    theme-settings.php