Added by Edgar E. Iglesias almost 13 years ago
Merge remote-tracking branch 'pm-arm/for-upstream' into pm