Merge branch 'fixes-non-critical-part3'
authorTony Lindgren <tony@atomide.com>
Fri, 9 Mar 2012 01:03:03 +0000 (17:03 -0800)
committerTony Lindgren <tony@atomide.com>
Fri, 9 Mar 2012 01:03:03 +0000 (17:03 -0800)

Trivial merge