Merge branch 'master' of /home/wd/git/u-boot/custodians
authorWolfgang Denk <wd@denx.de>
Sun, 13 Apr 2008 16:42:35 +0000 (09:42 -0700)
committerWolfgang Denk <wd@denx.de>
Sun, 13 Apr 2008 16:42:35 +0000 (09:42 -0700)

Trivial merge