Merge branch 'master' of git://www.denx.de/git/u-boot-video
authorWolfgang Denk <wd@denx.de>
Thu, 24 Apr 2008 12:00:54 +0000 (14:00 +0200)
committerWolfgang Denk <wd@denx.de>
Thu, 24 Apr 2008 12:00:54 +0000 (14:00 +0200)

Trivial merge