Merge branch 'master' of /home/stefan/git/u-boot/u-boot
authorStefan Roese <sr@denx.de>
Mon, 8 Sep 2008 08:35:49 +0000 (10:35 +0200)
committerStefan Roese <sr@denx.de>
Mon, 8 Sep 2008 08:35:49 +0000 (10:35 +0200)

Trivial merge