91c2fd1 rebase patch

Authored and Committed by Lukas Tinkl 14 years ago
    rebase patch