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

[Elder Marco]

Summary of changes:

  e34ca56... new upstream snapshot: 20130520 (*)
  73d9054... Merge branch 'master' into el5

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