Merge branch 'master' of git://git.denx.de/u-boot-ubi
authorWolfgang Denk <wd@denx.de>
Tue, 7 Jul 2009 18:58:30 +0000 (20:58 +0200)
committerWolfgang Denk <wd@denx.de>
Tue, 7 Jul 2009 18:58:30 +0000 (20:58 +0200)

Trivial merge