Merge branch 'master' of /home/wd/git/u-boot/master/
authorWolfgang Denk <wd@denx.de>
Fri, 1 Aug 2008 19:57:32 +0000 (21:57 +0200)
committerWolfgang Denk <wd@denx.de>
Fri, 1 Aug 2008 19:57:32 +0000 (21:57 +0200)

Trivial merge