Merge with /home/wd/git/u-boot/master
authorWolfgang Denk <[email protected]>
Wed, 11 Oct 2006 23:26:20 +0000 (01:26 +0200)
committerWolfgang Denk <[email protected]>
Wed, 11 Oct 2006 23:26:20 +0000 (01:26 +0200)

Trivial merge