Merge branch 'master' of ssh://10.10.0.7/home/wd/git/u-boot/master
authorWolfgang Denk <wd@denx.de>
Sun, 12 Oct 2008 21:25:50 +0000 (23:25 +0200)
committerWolfgang Denk <wd@denx.de>
Sun, 12 Oct 2008 21:25:50 +0000 (23:25 +0200)

Trivial merge