Merge branch 'master' of git://www.denx.de/git/u-boot
authorMarkus Klotzbuecher <mk@denx.de>
Mon, 4 Aug 2008 17:18:14 +0000 (19:18 +0200)
committerMarkus Klotzbuecher <mk@denx.de>
Mon, 4 Aug 2008 17:18:14 +0000 (19:18 +0200)

Trivial merge