Added by Luca Abeni over 10 years ago
Merge remote branch 'origin/nodeid-dtor'
Conflicts: som/TopologyManager/nccache.c