Merge branch 'fixes'
authorTony Lindgren <tony@atomide.com>
Mon, 13 Aug 2012 13:32:51 +0000 (06:32 -0700)
committerTony Lindgren <tony@atomide.com>
Mon, 13 Aug 2012 13:32:51 +0000 (06:32 -0700)

Trivial merge