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

[Elder Marco]

Summary of changes:

  c245181... new upstream snapshot: 20130901 (*)
  88b212e... Merge branch 'master' into el5

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