[rkward/f17: 3/3] Merge branch 'master' into f17

[Pierre-YvesChibon]

commit 1b63e04ceece7a6cc0cdfb656e2e930fef6d381d
Merge: 455ba66 6af8b76
Author: Pierre-Yves Chibon <pingou at pingoured.fr>
Date:   Mon Oct 29 10:50:53 2012 +0100

    Merge branch 'master' into f17

 .gitignore  |    1 +
 rkward.spec |   15 ++++++++-------
 sources     |    2 +-
 3 files changed, 10 insertions(+), 8 deletions(-)
---