Merge branch 'master' into next

Conflicts:
	make.sh
This commit is contained in:
Arne Fitzenreiter
2011-06-15 18:51:31 +02:00
30 changed files with 986 additions and 128 deletions