Merge branch 'master' of /home/wd/git/u-boot/custodians
authorWolfgang Denk <wd@denx.de>
Wed, 8 Jul 2009 19:51:17 +0000 (21:51 +0200)
committerWolfgang Denk <wd@denx.de>
Wed, 8 Jul 2009 19:51:17 +0000 (21:51 +0200)

Trivial merge