Merge branch 'fixes-v3.0-rc3' into devel-fixes
authorTony Lindgren <tony@atomide.com>
Tue, 14 Jun 2011 12:53:42 +0000 (05:53 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 14 Jun 2011 12:53:42 +0000 (05:53 -0700)

Trivial merge