Merge branch 'master' of git://git.denx.de/u-boot-video
authorWolfgang Denk <wd@denx.de>
Tue, 24 Feb 2009 21:56:00 +0000 (22:56 +0100)
committerWolfgang Denk <wd@denx.de>
Tue, 24 Feb 2009 21:56:00 +0000 (22:56 +0100)

Trivial merge