Merge branch 'master' of ssh://git.omp.am/home/omp/git/conky
authorNikolas Garofil <garo@dunaldi.garofil.be>
Sat, 21 Nov 2009 14:50:35 +0000 (15:50 +0100)
committerNikolas Garofil <garo@dunaldi.garofil.be>
Sat, 21 Nov 2009 14:50:35 +0000 (15:50 +0100)

Trivial merge