Merge with git://www.denx.de/git/u-boot-testing
authorWolfgang Denk <wd@atlas.denx.de>
Tue, 15 May 2007 20:12:06 +0000 (22:12 +0200)
committerWolfgang Denk <wd@atlas.denx.de>
Tue, 15 May 2007 20:12:06 +0000 (22:12 +0200)

Trivial merge