Merge branch 'fixes-non-critical' into tmp-merge
authorTony Lindgren <tony@atomide.com>
Wed, 27 Jun 2012 15:19:13 +0000 (08:19 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 27 Jun 2012 15:19:13 +0000 (08:19 -0700)

Trivial merge