Merge branch 'master' of ssh://mercury/home/wd/git/u-boot/master
authorWolfgang Denk <wd@denx.de>
Wed, 4 Jun 2008 23:12:30 +0000 (01:12 +0200)
committerWolfgang Denk <wd@denx.de>
Wed, 4 Jun 2008 23:12:30 +0000 (01:12 +0200)

Trivial merge