Merge branch 'fixes'
authorTony Lindgren <tony@atomide.com>
Tue, 7 Aug 2012 12:09:56 +0000 (05:09 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 7 Aug 2012 12:09:56 +0000 (05:09 -0700)

Trivial merge