Merge with /home/stefan/git/u-boot/denx-merge-sr
authorStefan Roese <sr@denx.de>
Fri, 5 Jan 2007 09:40:50 +0000 (10:40 +0100)
committerStefan Roese <sr@denx.de>
Fri, 5 Jan 2007 09:40:50 +0000 (10:40 +0100)

Trivial merge