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

[Elder Marco]

Summary of changes:

  8a3a1de... New upstream snapshot: 20120409 (*)
  175596b... Merge branch 'master' into el5

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