pcap-format: conflicts with mirage-net-socket
Merge branch 'pcap-format-conflict' into working
cudf.0.6.3: fix build commands
wget: fix build commands
Merge branch 'cudf.0.6.3-fix-build' into working
Merge branch 'wget-fix-build' into working
mldonkey: fix comment broken by new string syntax