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

[Elder Marco]

Summary of changes:

  6284c7d... New upstream snapshot: 20111117 (*)
  41a7e44... Merge branch 'master' into el6

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