[conky/f12/master: 15/16] Merge branch 'f13' into f12

[Miroslav Lichvar]

commit f5ed9df7bad28d60c8712750eff7b7082e41b82d
Merge: 6599025 1e59b9a
Author: Miroslav Lichvar <mlichvar at redhat.com>
Date:   Wed Oct 6 16:18:13 2010 +0200

    Merge branch 'f13' into f12
    
    Conflicts:
    	.gitignore

 .gitignore |    2 +-
 conky.spec |   36 +++++++++++++++++++++++++++++-------
 sources    |    2 +-
 3 files changed, 31 insertions(+), 9 deletions(-)
---