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

Trivial merge