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

Trivial merge