Merge branch 'master' into next
authorWolfgang Denk <wd@denx.de>
Sun, 15 Nov 2009 22:13:40 +0000 (23:13 +0100)
committerWolfgang Denk <wd@denx.de>
Sun, 15 Nov 2009 22:13:40 +0000 (23:13 +0100)

Trivial merge