1c647b9 Fix up patch conflict

Authored and Committed by bruno 10 years ago
    Fix up patch conflict