Merge branch 'kumar'
authorAndy Fleming <afleming@freescale.com>
Thu, 17 Jan 2008 21:52:38 +0000 (15:52 -0600)
committerAndrew Fleming-AFLEMING <afleming@freescale.com>
Thu, 17 Jan 2008 21:52:38 +0000 (15:52 -0600)

Trivial merge