Merge branch 'fixes'
authorTony Lindgren <tony@atomide.com>
Wed, 5 Sep 2012 17:30:46 +0000 (10:30 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 5 Sep 2012 17:30:46 +0000 (10:30 -0700)

Trivial merge