Merge branch 'master' of /home/wd/git/u-boot/custodians
authorWolfgang Denk <wd@denx.de>
Fri, 21 Aug 2009 20:56:01 +0000 (22:56 +0200)
committerWolfgang Denk <wd@denx.de>
Fri, 21 Aug 2009 20:56:01 +0000 (22:56 +0200)

Trivial merge