Merge with git://www.denx.de/git/u-boot-testing
authorWolfgang Denk <wd@denx.de>
Fri, 6 Jul 2007 08:38:28 +0000 (10:38 +0200)
committerWolfgang Denk <wd@denx.de>
Fri, 6 Jul 2007 08:38:28 +0000 (10:38 +0200)

Trivial merge