[bpython/f12/master: 11/11] Merge branch 'master' into f12

[terjeros]

commit d30f63ddb53c5fea0badeb2770cc58e7807f82e3
Merge: b0e8b6c 176d1db
Author: Terje Røsten <terje.rosten at ntnu.no>
Date:   Sun Sep 26 11:42:27 2010 +0200

    Merge branch 'master' into f12
    
    Conflicts:
    	.gitignore
    	bpython.spec
    	sources

 .gitignore                    |    4 ++-
 bpython-0.9.6.2-suspend.patch |   54 -----------------------------------------
 bpython-0.9.7.1-desktop.patch |   18 +++++++++++++
 bpython.spec                  |   53 +++++++++++++++++++++++++--------------
 sources                       |    4 ++-
 5 files changed, 58 insertions(+), 75 deletions(-)
---
diff --cc .gitignore
index 4bba16e,43342e1..b5740ea
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,3 +1,3 @@@
--bpython-0.9.6.2.tar.gz
+ /bpython-0.9.7.1.tar.gz
+ /bpython.png
++
diff --cc sources
index d513a8e,328de7c..8807e2c
--- a/sources
+++ b/sources
@@@ -1,1 -1,2 +1,3 @@@
- d30fdb663fa9957c21c63108ed249b59  bpython-0.9.6.2.tar.gz
+ f32ce6aa8ae6af8d2cf65e13f58859d4  bpython-0.9.7.1.tar.gz
+ 104e5f804b904afecbe85c3c05462fc0  bpython.png
++