[bpython/f13/master: 9/9] Merge branch 'master' into f13

[terjeros]

commit fabdfdc6f11393c0916de97674a9b5d98361bf9c
Merge: 5925365 176d1db
Author: Terje Røsten <terje.rosten at ntnu.no>
Date:   Thu Sep 16 20:19:09 2010 +0200

    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore
    	bpython.spec
    	sources
    
    - 0.9.7.1

 .gitignore                    |    2 +
 bpython-0.9.6.2-suspend.patch |   54 -----------------------------------------
 bpython-0.9.7.1-desktop.patch |   18 +++++++++++++
 bpython.spec                  |   54 +++++++++++++++++++++++++----------------
 sources                       |    3 +-
 5 files changed, 55 insertions(+), 76 deletions(-)
---