Merge branch 'pm' into devel-stable

This commit is contained in:
Russell King 2011-09-22 22:39:23 +01:00
commit b0a37dca72
12 changed files with 197 additions and 201 deletions