Merge branch 'master' into next
authorWolfgang Denk <wd@denx.de>
Tue, 25 Aug 2009 20:57:10 +0000 (22:57 +0200)
committerWolfgang Denk <wd@denx.de>
Tue, 25 Aug 2009 20:57:10 +0000 (22:57 +0200)

Trivial merge