Merge branch 'master' of ssh://gemini/home/wd/git/u-boot/master
authorWolfgang Denk <wd@denx.de>
Wed, 23 Jun 2010 18:55:27 +0000 (20:55 +0200)
committerWolfgang Denk <wd@denx.de>
Wed, 23 Jun 2010 18:55:27 +0000 (20:55 +0200)

Trivial merge