Merge branch 'master' of git://git.denx.de/u-boot-sh
authorWolfgang Denk <wd@denx.de>
Tue, 30 Nov 2010 20:28:03 +0000 (21:28 +0100)
committerWolfgang Denk <wd@denx.de>
Tue, 30 Nov 2010 20:28:03 +0000 (21:28 +0100)

Trivial merge