Merge branch 'denx'
authorAndy Fleming <afleming@freescale.com>
Mon, 27 Oct 2008 22:31:05 +0000 (17:31 -0500)
committerAndrew Fleming-AFLEMING <afleming@freescale.com>
Mon, 27 Oct 2008 22:31:05 +0000 (17:31 -0500)

Trivial merge