Merge tag '6.28' of http://git.drupal.org/project/drupal into 6.28

Drupal 6.28 release

Resolved Conflicts:
	CHANGELOG.txt
	includes/file.inc
Merge pull request #65 from pressflow/6.28

Drupal 6.28
Merging drupal 6.29, resolving conflicts.
Merge branch 'pressflow-6.29'
Merge tag 'pressflow-6.29'

Drupal 6.29.
md6-6.29.25, 2013-11-22