Drupal 7.24
Merge tag '7.24' into 7.x

7.24 release

Conflicts:
	CHANGELOG.txt
	includes/bootstrap.inc