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

[Elder Marco]

Summary of changes:

  8dc08fe... new upstream snapshot: 20130126 (*)
  7040928... Merge branch 'master' into el5

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