coding convention fixes (mostly due to astyle)
Merge branch 'mc1322x' into 'master'
Merge branch 'master' of github.com:RIOT-OS/boards into origin-master

Conflicts:
	redbee-econotag/drivers/redbee_uart.c
	redbee-econotag/drivers/redbee_uart1.c