[asunder/f13/master: 6/6] Merge branch 'master' into f13

[Marcin Zajaczkowski]

commit 60ff51613e6fe0aa8bc9de16610d29abe9eef223
Merge: 8125982 b57bcba
Author: Marcin Zajaczkowski <szpak at users.sourceforge.net>
Date:   Sun Aug 15 20:47:46 2010 +0200

    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore
    	asunder.spec
    	sources

 .gitignore   |    3 ++-
 asunder.spec |    5 ++++-
 sources      |    2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)
---