[plowshare/f15] (2 commits) ...Merge branch 'master' into f15

[Elder Marco]

Summary of changes:

  6284c7d... New upstream snapshot: 20111117 (*)
  876647c... Merge branch 'master' into f15

(*) This commit already existed in another branch; no separate mail sent