Merge branch 'master' of git://git.denx.de/u-boot-video
authorWolfgang Denk <wd@denx.de>
Tue, 28 Oct 2008 07:37:19 +0000 (08:37 +0100)
committerWolfgang Denk <wd@denx.de>
Tue, 28 Oct 2008 07:37:19 +0000 (08:37 +0100)

Trivial merge