Merge branch 'master' of /home/stefan/git/u-boot/u-boot
authorStefan Roese <sr@denx.de>
Wed, 5 Mar 2008 16:22:06 +0000 (17:22 +0100)
committerStefan Roese <sr@denx.de>
Wed, 5 Mar 2008 16:22:06 +0000 (17:22 +0100)

Trivial merge