error in error reporting
just example
Merge branch 'master' of github.com:stuart12/n900_scripts

Conflicts:
	stuart