Merge branch 'master' of /home/wd/git/u-boot/master/
authorWolfgang Denk <wd@denx.de>
Mon, 24 Mar 2008 23:12:54 +0000 (00:12 +0100)
committerWolfgang Denk <wd@denx.de>
Mon, 24 Mar 2008 23:12:54 +0000 (00:12 +0100)

Trivial merge