Merge branch 'master' of /home/wd/git/u-boot/custodians
authorWolfgang Denk <wd@denx.de>
Sun, 6 Jul 2008 22:33:07 +0000 (00:33 +0200)
committerWolfgang Denk <wd@denx.de>
Sun, 6 Jul 2008 22:33:07 +0000 (00:33 +0200)

Trivial merge