Merge branch 'master' of ssh://10.10.0.7/home/wd/git/u-boot/master
authorWolfgang Denk <wd@denx.de>
Thu, 31 Jul 2008 10:30:40 +0000 (12:30 +0200)
committerWolfgang Denk <wd@denx.de>
Thu, 31 Jul 2008 10:30:40 +0000 (12:30 +0200)

Trivial merge