Merge branch 'master' of git://git.denx.de/u-boot-ubi
authorWolfgang Denk <wd@denx.de>
Wed, 20 May 2009 20:42:04 +0000 (22:42 +0200)
committerWolfgang Denk <wd@denx.de>
Wed, 20 May 2009 20:42:04 +0000 (22:42 +0200)

Trivial merge