[warzone2100: 2/3] Merge branch 'master' into f17

[jsynacek]

commit f0de2984a9df6d8a8fb820bea69f3c2d07e7d8fb
Merge: 022bab0 69c68be
Author: Jan Synacek <jsynacek at redhat.com>
Date:   Wed Jun 20 12:26:48 2012 +0200

    Merge branch 'master' into f17
    
    Conflicts:
    	.gitignore
    	sources
    	warzone2100.spec

 .gitignore       |    2 ++
 sources          |    2 +-
 warzone2100.spec |   16 +++++++++++++---
 3 files changed, 16 insertions(+), 4 deletions(-)
---