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

Trivial merge