Merge branch 'master' of git://git.denx.de/u-boot-video
authorWolfgang Denk <wd@denx.de>
Thu, 30 Apr 2009 20:58:17 +0000 (22:58 +0200)
committerWolfgang Denk <wd@denx.de>
Thu, 30 Apr 2009 20:58:17 +0000 (22:58 +0200)

Trivial merge