Binary: merge

2ping6 ibmssh nstor_lsmplugin mk-query-profiler mlpack_hmm_generate axfr-get snmpvacm ocamlopt.opt vcoverage createTables.php pw.x_openmpi repodiffer source-highlight-settings collectaddys gview yppasswd hydra-wizard jocamllex akonadi_migration_agent pn53x-diagnose PTcrop mia-2dgrayimage-combine-to-rgb shutdown tcptraceroute6 nova-scheduler class-6d.x pfsstat science-nanoscale-physics sordi xx-cvs-diff