Merge branch 'master' of git://www.denx.de/git/u-boot-at91
authorWolfgang Denk <wd@denx.de>
Sun, 6 Jul 2008 22:47:58 +0000 (00:47 +0200)
committerWolfgang Denk <wd@denx.de>
Sun, 6 Jul 2008 22:47:58 +0000 (00:47 +0200)

Trivial merge