Merge branch 'master' of git://www.denx.de/git/u-boot-sh
authorWolfgang Denk <wd@denx.de>
Wed, 23 Jan 2008 13:35:26 +0000 (14:35 +0100)
committerWolfgang Denk <wd@denx.de>
Wed, 23 Jan 2008 13:35:26 +0000 (14:35 +0100)

Trivial merge