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

Trivial merge