Merge branch 'denx'
authorAndy Fleming <afleming@freescale.com>
Thu, 14 Feb 2008 00:36:27 +0000 (18:36 -0600)
committerAndrew Fleming-AFLEMING <afleming@freescale.com>
Thu, 14 Feb 2008 00:36:27 +0000 (18:36 -0600)

Trivial merge