Drupal 6.24
Merge branch 'vendor6' into drupal6

Conflicts:
	modules/system/system.module