885b3e5 Resolved conflicts.

Merged and Committed by Björn Persson 12 years ago
    Resolved conflicts.