Merge branch 'master' of /home/stefan/git/u-boot/u-boot
authorStefan Roese <sr@denx.de>
Sun, 13 Jan 2008 14:04:37 +0000 (15:04 +0100)
committerStefan Roese <sr@denx.de>
Sun, 13 Jan 2008 14:04:37 +0000 (15:04 +0100)

Trivial merge