Merge branch 'fixes'
authorTony Lindgren <tony@atomide.com>
Thu, 7 Jun 2012 06:49:08 +0000 (23:49 -0700)
committerTony Lindgren <tony@atomide.com>
Thu, 7 Jun 2012 06:49:08 +0000 (23:49 -0700)

Trivial merge