Merge branch 'master' of ssh://gemini/home/wd/git/u-boot/master
authorWolfgang Denk <wd@denx.de>
Tue, 22 Jun 2010 22:40:03 +0000 (00:40 +0200)
committerWolfgang Denk <wd@denx.de>
Tue, 22 Jun 2010 22:40:03 +0000 (00:40 +0200)

Trivial merge