[asunder: 10/11] Merge commit 'origin/f13/master'

[Marcin Zajaczkowski]

commit b3eda37d3fad9eefb0f63f9f57671c17db147cdd
Merge: b57bcba 8125982
Author: Marcin Zajaczkowski <szpak at users.sourceforge.net>
Date:   Sun Aug 15 23:12:33 2010 +0200

    Merge commit 'origin/f13/master'
    
    Conflicts:
    	.gitignore
    	asunder.spec
    	sources

---