Merge branch 'master' of git://git.denx.de/u-boot-video
authorWolfgang Denk <wd@denx.de>
Sun, 26 Jul 2009 21:15:57 +0000 (23:15 +0200)
committerWolfgang Denk <wd@denx.de>
Sun, 26 Jul 2009 21:15:57 +0000 (23:15 +0200)

Trivial merge