Merge snmp stuff into mirror.git