Merge branch 'master' of git+ssh://10.10.0.7/home/wd/git/u-boot/master
authorWolfgang Denk <wd@denx.de>
Thu, 1 May 2008 19:39:34 +0000 (21:39 +0200)
committerWolfgang Denk <wd@denx.de>
Thu, 1 May 2008 19:39:34 +0000 (21:39 +0200)

Trivial merge