Merge ../custodians
authorWolfgang Denk <wd@denx.de>
Wed, 23 Jan 2008 13:40:34 +0000 (14:40 +0100)
committerWolfgang Denk <wd@denx.de>
Wed, 23 Jan 2008 13:40:34 +0000 (14:40 +0100)

Trivial merge