Merge branch 'common-6x' into legacy_63

diff --cc fetchmail-SA-2011-01.txt
index 6e01ddab9c84e5583a99c11050a43b6a14c1eb6c,6d7f5c0c55dd6dc371d8abf6ffcf7d3b3d103c16..09aa90f65fab6a4321af09c3ad7b335b07389050
--- 1/fetchmail-SA-2011-01.txt
--- 2/fetchmail-SA-2011-01.txt
+++ b/fetchmail-SA-2011-01.txt
@@@ -8,10 -8,11 +8,11 @@@ Announced:    2011-06-0
  Type:         Unguarded blocking I/O can cause indefinite application hang
  Impact:               Denial of service
  Danger:               low
+ Acknowledgment:       Thomas Jarosch for sending detailed report
  
  CVE Name:     CVE-2011-1947
 -CVSSv2:               
 -CVSS scores:  
 +CVSSv2:               (AV:N/AC:M/Au:S/C:N/I:N/A:C/E:U/RL:O/RC:C)
 +CVSS scores:  4.7: Base 6.3 (Impact 6.9 Exploitability 6.8) Temporal 4.7
                This is calculated without Environmental Score.
  URL:          http://www.fetchmail.info/fetchmail-SA-2011-01.txt
  Project URL:  http://www.fetchmail.info/