Merge branch 'master' of /home/wd/git/u-boot/work
authorWolfgang Denk <wd@denx.de>
Sat, 22 Mar 2008 22:27:43 +0000 (23:27 +0100)
committerWolfgang Denk <wd@denx.de>
Sat, 22 Mar 2008 22:27:43 +0000 (23:27 +0100)

Trivial merge