Merge branch 'master' of git://www.denx.de/git/u-boot-net
authorWolfgang Denk <wd@denx.de>
Tue, 29 Apr 2008 21:39:42 +0000 (23:39 +0200)
committerWolfgang Denk <wd@denx.de>
Tue, 29 Apr 2008 21:39:42 +0000 (23:39 +0200)

Trivial merge