Merge branch 'master' of git://www.denx.de/git/u-boot-net
authorWolfgang Denk <wd@denx.de>
Fri, 16 Nov 2007 20:50:12 +0000 (21:50 +0100)
committerWolfgang Denk <wd@denx.de>
Fri, 16 Nov 2007 20:50:12 +0000 (21:50 +0100)

Trivial merge