Upgraded to version 3.0.1
Merge branch 'original' (version 3.0.1)

Conflicts solved:
	app/code/community/Fooman/Speedster/Block/Page/Html/Head.php
	lib/minify/m.php