line endings.
Merge branch 'master' of git://github.com/diversen/system

Conflicts:
	blocks/system_admin_menu.inc
	modules/update.php
Merge branch 'master' of git://github.com/diversen/system
Merge branch 'master' of git://github.com/diversen/system