Merge branch 'master' of git://git.denx.de/u-boot-nios
authorWolfgang Denk <wd@denx.de>
Tue, 1 Dec 2009 09:15:22 +0000 (10:15 +0100)
committerWolfgang Denk <wd@denx.de>
Tue, 1 Dec 2009 09:15:22 +0000 (10:15 +0100)

Trivial merge