Merge branch 'prm' into tmp-merge
authorTony Lindgren <tony@atomide.com>
Tue, 3 Apr 2012 17:21:19 +0000 (10:21 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 3 Apr 2012 17:21:19 +0000 (10:21 -0700)

Trivial merge