Merge branch 'fixes'
authorTony Lindgren <tony@atomide.com>
Wed, 8 Aug 2012 14:39:52 +0000 (07:39 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 8 Aug 2012 14:39:52 +0000 (07:39 -0700)

Trivial merge