Merge with git://www.denx.de/git/u-boot.git
authorStefan Roese <sr@denx.de>
Wed, 15 Aug 2007 19:11:45 +0000 (21:11 +0200)
committerStefan Roese <sr@denx.de>
Wed, 15 Aug 2007 19:11:45 +0000 (21:11 +0200)

Trivial merge