[orc: 6/6] Merge remote branch 'origin/f13/master'

[Fabian Deutsch]

commit 40b952412daa0953b9d4f8c04337a9ba56f872e8
Merge: 717584b 14ebe92
Author: Fabian Deutsch <fabian.deutsch at gmx.de>
Date:   Sat Aug 21 14:22:12 2010 +0200

    Merge remote branch 'origin/f13/master'
    
    Conflicts:
    	.gitignore
    	orc.spec
    	sources
    
    Signed-off-by: Fabian Deutsch <fabian.deutsch at gmx.de>

---