Merge commit 'wd/master'
authorJon Loeliger <jdl@freescale.com>
Thu, 14 Feb 2008 20:07:21 +0000 (14:07 -0600)
committerJon Loeliger <jdl@freescale.com>
Thu, 14 Feb 2008 20:07:21 +0000 (14:07 -0600)

Trivial merge