[shedskin/f14: 3/3] Merge branch 'master' into f14

[tomspur]

commit 86c4f647211c2c2f955c8a6cef5f17c2318fd6c2
Merge: 0e4bb53 3c5efa9
Author: Thomas Spura <tomspur at fedoraproject.org>
Date:   Thu Jun 16 08:19:36 2011 +0200

    Merge branch 'master' into f14

 .gitignore    |    1 +
 shedskin.spec |   23 +++++++++++++++++++++--
 sources       |    2 +-
 3 files changed, 23 insertions(+), 3 deletions(-)
---