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

Trivial merge