[mnemosyne: 6/6] Merge remote branch 'origin/el5/master'

[Dominik Mierzejewski]

commit 25bab4356fb8f4967dec0fd4b45ade717cc4d328
Merge: 4c97355 e0be638
Author: Dominik Mierzejewski <dominik at greysector.net>
Date:   Sat Nov 20 23:40:19 2010 +0100

    Merge remote branch 'origin/el5/master'
    
    Conflicts:
    	mnemosyne.spec
    	sources

---