78cea31 Merge cleanup.

Authored and Committed by corsepiu 11 years ago
    Merge cleanup.