Merge branch 'master' of /home/wd/git/u-boot/custodians
authorWolfgang Denk <wd@denx.de>
Fri, 12 Sep 2008 14:14:28 +0000 (16:14 +0200)
committerWolfgang Denk <wd@denx.de>
Fri, 12 Sep 2008 14:14:28 +0000 (16:14 +0200)

Trivial merge