Merge branch 'next' of ../custodians into next
authorWolfgang Denk <wd@denx.de>
Tue, 21 Sep 2010 07:34:37 +0000 (09:34 +0200)
committerWolfgang Denk <wd@denx.de>
Tue, 21 Sep 2010 07:34:37 +0000 (09:34 +0200)

Trivial merge