Merge branch 'fixes'
authorTony Lindgren <tony@atomide.com>
Fri, 31 Aug 2012 00:57:07 +0000 (17:57 -0700)
committerTony Lindgren <tony@atomide.com>
Fri, 31 Aug 2012 00:57:07 +0000 (17:57 -0700)

Trivial merge