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

Trivial merge