Merge branch 'master' of /home/stefan/git/u-boot/u-boot
authorStefan Roese <sr@denx.de>
Fri, 7 Mar 2008 06:47:30 +0000 (07:47 +0100)
committerStefan Roese <sr@denx.de>
Fri, 7 Mar 2008 06:47:30 +0000 (07:47 +0100)

Trivial merge