Merge branch 'master' of /home/wd/git/u-boot/master/
authorWolfgang Denk <wd@denx.de>
Fri, 9 May 2008 20:18:58 +0000 (22:18 +0200)
committerWolfgang Denk <wd@denx.de>
Fri, 9 May 2008 20:18:58 +0000 (22:18 +0200)

Trivial merge