Merge branch 'next' of ../custodians into next
authorWolfgang Denk <[email protected]>
Tue, 21 Sep 2010 07:22:17 +0000 (09:22 +0200)
committerWolfgang Denk <[email protected]>
Tue, 21 Sep 2010 07:22:17 +0000 (09:22 +0200)

Trivial merge