[rkward/f15: 10/11] Merge branch 'master' into f15

[Pierre-YvesChibon]

commit 70c28e79caf7d88542fb1ff66917b5767659ff75
Merge: b478375 8ae1d11
Author: Pierre-Yves Chibon <pingou at pingoured.fr>
Date:   Tue Oct 25 10:10:29 2011 +0200

    Merge branch 'master' into f15
    
    Conflicts:
    	.gitignore
    	rkward.spec
    	sources

 .gitignore  |    1 +
 rkward.spec |   24 ++++++++++++------------
 sources     |    2 +-
 3 files changed, 14 insertions(+), 13 deletions(-)
---