Merge remote-tracking branch 'origin/master'
authorScott Wood <scottwood@freescale.com>
Fri, 14 Dec 2012 22:03:55 +0000 (16:03 -0600)
committerScott Wood <scottwood@freescale.com>
Fri, 14 Dec 2012 22:03:55 +0000 (16:03 -0600)

Trivial merge