Merge branch 'master' of git://git.denx.de/u-boot-sh
authorWolfgang Denk <wd@denx.de>
Sat, 9 Aug 2008 23:04:17 +0000 (01:04 +0200)
committerWolfgang Denk <wd@denx.de>
Sat, 9 Aug 2008 23:04:17 +0000 (01:04 +0200)

Trivial merge