Merge branch 'master' of git://git.denx.de/u-boot-net
authorWolfgang Denk <wd@denx.de>
Fri, 21 Aug 2009 21:03:58 +0000 (23:03 +0200)
committerWolfgang Denk <wd@denx.de>
Fri, 21 Aug 2009 21:03:58 +0000 (23:03 +0200)

Trivial merge