Merge with git://www.denx.de/git/u-boot-testing
authorWolfgang Denk <wd@denx.de>
Fri, 20 Apr 2007 13:44:38 +0000 (15:44 +0200)
committerWolfgang Denk <wd@denx.de>
Fri, 20 Apr 2007 13:44:38 +0000 (15:44 +0200)

Trivial merge