Merge remote branch 'origin/master' into next
authorWolfgang Denk <wd@denx.de>
Sun, 21 Mar 2010 21:45:36 +0000 (22:45 +0100)
committerWolfgang Denk <wd@denx.de>
Sun, 21 Mar 2010 21:45:36 +0000 (22:45 +0100)

Trivial merge