Merge branch 'master' of /home/stefan/git/u-boot/u-boot
authorStefan Roese <sr@denx.de>
Mon, 13 Oct 2008 09:17:31 +0000 (11:17 +0200)
committerStefan Roese <sr@denx.de>
Mon, 13 Oct 2008 09:17:31 +0000 (11:17 +0200)

Trivial merge