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

[Elder Marco]

Summary of changes:

  e9f3c91... New upstream snapshot: 20120707 (*)
  2b5b8e2... Merge branch 'master' into el5

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