Merge branch 'master' of git://git.denx.de/u-boot-net
authorWolfgang Denk <wd@denx.de>
Tue, 14 Oct 2008 11:07:43 +0000 (13:07 +0200)
committerWolfgang Denk <wd@denx.de>
Tue, 14 Oct 2008 11:07:43 +0000 (13:07 +0200)

Trivial merge