Merge branch 'master' of git://git.denx.de/u-boot-ubi
authorWolfgang Denk <wd@denx.de>
Mon, 13 Jul 2009 21:28:37 +0000 (23:28 +0200)
committerWolfgang Denk <wd@denx.de>
Mon, 13 Jul 2009 21:28:37 +0000 (23:28 +0200)

Trivial merge