Merge branch 'master' of git://git.denx.de/u-boot-ubi
authorWolfgang Denk <wd@denx.de>
Wed, 23 Sep 2009 22:18:10 +0000 (00:18 +0200)
committerWolfgang Denk <wd@denx.de>
Wed, 23 Sep 2009 22:18:10 +0000 (00:18 +0200)

Trivial merge