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

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

Sprout from DRUPAL-6--1 2010-03-29 16:05:52 UTC waleed al qadi <waleedq@375290.no-reply.drupal.org> 'views2 integration'
Cherrypick from DRUPAL-6--1 2010-03-11 15:52:30 UTC Ashraf Amayreh <ashraf@o-minds.com> '- Fixed safe mode checks to account for boolean and string return values...':
    aggregation.module