Merge branch 'master' of /home/stefan/git/u-boot/u-boot
authorStefan Roese <sr@denx.de>
Mon, 11 Aug 2008 04:43:38 +0000 (06:43 +0200)
committerStefan Roese <sr@denx.de>
Mon, 11 Aug 2008 04:43:38 +0000 (06:43 +0200)

Trivial merge