Merge branch 'master' of git://git.denx.de/u-boot-net
authorWolfgang Denk <wd@denx.de>
Thu, 23 Jul 2009 17:20:26 +0000 (19:20 +0200)
committerWolfgang Denk <wd@denx.de>
Thu, 23 Jul 2009 17:20:26 +0000 (19:20 +0200)

Trivial merge