Merge branch 'reloc'
authorWolfgang Denk <wd@denx.de>
Thu, 8 Oct 2009 22:03:18 +0000 (00:03 +0200)
committerWolfgang Denk <wd@denx.de>
Thu, 8 Oct 2009 22:03:18 +0000 (00:03 +0200)

Trivial merge