Merge branch 'denx'
authorAndy Fleming <afleming@freescale.com>
Tue, 9 Sep 2008 21:16:20 +0000 (16:16 -0500)
committerAndrew Fleming-AFLEMING <afleming@freescale.com>
Tue, 9 Sep 2008 21:16:20 +0000 (16:16 -0500)

Trivial merge