Merge branch 'master' of /home/stefan/git/u-boot/u-boot
authorStefan Roese <sr@denx.de>
Thu, 10 Jul 2008 07:09:45 +0000 (09:09 +0200)
committerStefan Roese <sr@denx.de>
Thu, 10 Jul 2008 07:09:45 +0000 (09:09 +0200)

Trivial merge