Merge branch 'master' of ssh://gemini/home/wd/git/u-boot/master
authorWolfgang Denk <wd@denx.de>
Fri, 30 Apr 2010 22:44:42 +0000 (00:44 +0200)
committerWolfgang Denk <wd@denx.de>
Fri, 30 Apr 2010 22:44:42 +0000 (00:44 +0200)

Trivial merge