[kross-interpreters/f17: 8/8] Merge branch 'master' into f17

[Rex Dieter]

commit e5847377f56d6721e5a5b5758ac671555317b659
Merge: 4d1ee75 9a1f1d8
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Sep 10 07:44:51 2012 -0500

    Merge branch 'master' into f17
    
    Conflicts:
    	.gitignore
    	kross-interpreters.spec
    	sources

 .gitignore              |    3 +--
 kross-interpreters.spec |   35 ++++++++++++++++++-----------------
 sources                 |    2 +-
 3 files changed, 20 insertions(+), 20 deletions(-)
---