[conky/f13/master: 7/7] Merge branch 'master' into f13

[Miroslav Lichvar]

commit 1e59b9a048a34c5dde711d018bbf16dbb5f61003
Merge: 52a7cc6 41cc446
Author: Miroslav Lichvar <mlichvar at redhat.com>
Date:   Wed Oct 6 15:46:14 2010 +0200

    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore
    	conky-1.8.0-audclient.patch
    	conky.spec
    	sources

 .gitignore                  |    2 +-
 conky-1.8.0-audclient.patch |   35 -----------------------------------
 conky-1.8.0-truefalse.patch |   37 -------------------------------------
 conky.spec                  |   11 +++++------
 sources                     |    2 +-
 5 files changed, 7 insertions(+), 80 deletions(-)
---