Merge with /home/stefan/git/u-boot/denx-merge-sr
authorStefan Roese <sr@denx.de>
Wed, 21 Feb 2007 11:54:04 +0000 (12:54 +0100)
committerStefan Roese <sr@denx.de>
Wed, 21 Feb 2007 11:54:04 +0000 (12:54 +0100)

Trivial merge