Merge branch 'master' of git://git.denx.de/u-boot-net
authorWolfgang Denk <wd@denx.de>
Tue, 24 Nov 2009 22:27:06 +0000 (23:27 +0100)
committerWolfgang Denk <wd@denx.de>
Tue, 24 Nov 2009 22:27:06 +0000 (23:27 +0100)

Trivial merge