Merge with /home/m8/git/u-boot/
authorDetlev Zundel <dzu@denx.de>
Wed, 10 Jan 2007 15:36:51 +0000 (16:36 +0100)
committerDetlev Zundel <dzu@denx.de>
Wed, 10 Jan 2007 15:36:51 +0000 (16:36 +0100)

Trivial merge