* snmp__apc_ups2_ is in fact snmp__ups_ - a plugin for UPSes that supports the UPS-MIB
* Rather complete rewrite of snmp__apc_ups3_ script: All perl, all multigraph, one plugin to graph it all.
Fix typos in netstat_bsd_m and ejabberd_scanlog
netstat_s: support singular nouns

BSD netstat uses singular nouns when the statistics entry value is 1:
* fragment(s)
* packet(s)
* redirect(s)
* datagram(s)