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

[Elder Marco]

Summary of changes:

  8a3a1de... New upstream snapshot: 20120409 (*)
  2f773da... Merge branch 'master' into el6

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