Merge branch 'jdl'
authorJon Loeliger <jdl@freescale.com>
Wed, 7 Jun 2006 13:56:30 +0000 (08:56 -0500)
committerJon Loeliger <jdl@freescale.com>
Wed, 7 Jun 2006 13:56:30 +0000 (08:56 -0500)

Trivial merge