Drupal 6.29
Merge branch 'refs/heads/vanilla-6.29' into pressflow-plus-6.29

Conflicts:
	includes/bootstrap.inc
	includes/file.inc
Sync with vanilla-6.29
Skip file_create_htaccess() on BOA since .htaccess is never used in Nginx.
Merge branch 'refs/heads/pressflow-plus-6.29' into pressflow-plus