Merge branch 'master' of git://www.denx.de/git/u-boot-net
authorWolfgang Denk <wd@denx.de>
Wed, 11 Jun 2008 20:17:42 +0000 (22:17 +0200)
committerWolfgang Denk <wd@denx.de>
Wed, 11 Jun 2008 20:17:42 +0000 (22:17 +0200)

Trivial merge