Merge with git+ssh://gemini/home/wd/git/u-boot/master
authorWolfgang Denk <wd@denx.de>
Wed, 29 Aug 2007 14:22:54 +0000 (16:22 +0200)
committerWolfgang Denk <wd@denx.de>
Wed, 29 Aug 2007 14:22:54 +0000 (16:22 +0200)

Trivial merge