Merge branch 'master' of git://git.denx.de/u-boot-net
authorWolfgang Denk <wd@denx.de>
Sat, 8 Aug 2009 10:08:09 +0000 (12:08 +0200)
committerWolfgang Denk <wd@denx.de>
Sat, 8 Aug 2009 10:08:09 +0000 (12:08 +0200)

Trivial merge