Merge branch 'master' of /home/wd/git/u-boot/master/
authorWolfgang Denk <wd@denx.de>
Wed, 22 Jul 2009 22:48:20 +0000 (00:48 +0200)
committerWolfgang Denk <wd@denx.de>
Wed, 22 Jul 2009 22:48:20 +0000 (00:48 +0200)

Trivial merge