Merge ../custodians
authorWolfgang Denk <wd@denx.de>
Fri, 11 Jan 2008 22:53:26 +0000 (23:53 +0100)
committerWolfgang Denk <wd@denx.de>
Fri, 11 Jan 2008 22:53:26 +0000 (23:53 +0100)

Trivial merge