7c43e5e Merge cleanup.

Authored and Committed by corsepiu 10 years ago
    Merge cleanup.