Merge branch 'master' of /home/git/u-boot/
authorWolfgang Denk <wd@denx.de>
Sat, 20 Oct 2007 22:10:34 +0000 (00:10 +0200)
committerWolfgang Denk <wd@denx.de>
Sat, 20 Oct 2007 22:10:34 +0000 (00:10 +0200)

Trivial merge