Merge branch 'cleanup-pm' into tmp-merge
authorTony Lindgren <tony@atomide.com>
Tue, 6 Mar 2012 22:26:03 +0000 (14:26 -0800)
committerTony Lindgren <tony@atomide.com>
Tue, 6 Mar 2012 22:26:03 +0000 (14:26 -0800)

Trivial merge