Merge branch 'master' of git://git.denx.de/u-boot-sh
authorWolfgang Denk <wd@denx.de>
Sun, 15 Mar 2009 21:15:13 +0000 (22:15 +0100)
committerWolfgang Denk <wd@denx.de>
Sun, 15 Mar 2009 21:15:13 +0000 (22:15 +0100)

Trivial merge