[konversation/f16: 4/4] Merge branch 'master' into f16

[Rex Dieter]

commit daf6c61451ef71e87435738fbdb7131c1fbc1acb
Merge: 94af629 bb6266f
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Dec 5 09:44:45 2011 -0600

    Merge branch 'master' into f16
    
    Conflicts:
    	konversation.spec

 .gitignore                                     |    3 +-
 konversation-1.3.1-fix_scroll_background.patch |   41 ---
 konversation.spec                              |   30 +-
 konverstation-1.3.1-kdebug210106.patch         |  418 ------------------------
 sources                                        |    2 +-
 5 files changed, 17 insertions(+), 477 deletions(-)
---