cc29642 Fixed improper merge of a patch

Authored and Committed by ahs3 9 years ago
    Fixed improper merge of a patch