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

[Elder Marco]

Summary of changes:

  2d165ae... New upstream snapshot: 20120916 (*)
  bc4623d... Merge branch 'master' into el6

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