9cce939 conflicts: use defaultdict instead of has_key

Authored and Committed by mkrizek 12 years ago
    conflicts: use defaultdict instead of has_key