Merge commit '3deca9d'

Conflicts:

	Makefile

Signed-off-by: Wolfgang Denk <wd@denx.de>