93c737f Fix incorrectly merged patch

Authored and Committed by mizdebsk 9 years ago
    Fix incorrectly merged patch