Merge with git://www.denx.de/git/u-boot-testing
authorWolfgang Denk <wd@denx.de>
Tue, 3 Jul 2007 23:19:49 +0000 (01:19 +0200)
committerWolfgang Denk <wd@denx.de>
Tue, 3 Jul 2007 23:19:49 +0000 (01:19 +0200)

Trivial merge