Merge ../custodians
authorWolfgang Denk <wd@denx.de>
Thu, 14 Feb 2008 23:16:32 +0000 (00:16 +0100)
committerWolfgang Denk <wd@denx.de>
Thu, 14 Feb 2008 23:16:32 +0000 (00:16 +0100)

Trivial merge