Merge branch 'master' of git://git.denx.de/u-boot-ubi
authorWolfgang Denk <wd@denx.de>
Fri, 9 Apr 2010 19:49:42 +0000 (21:49 +0200)
committerWolfgang Denk <wd@denx.de>
Fri, 9 Apr 2010 19:49:42 +0000 (21:49 +0200)

Trivial merge