Merge branch 'master' of ssh://git.omp.am/home/omp/git/conky
authorNikolas Garofil <garo@dunaldi.garofil.be>
Sun, 8 Nov 2009 19:30:50 +0000 (20:30 +0100)
committerNikolas Garofil <garo@dunaldi.garofil.be>
Sun, 8 Nov 2009 19:30:50 +0000 (20:30 +0100)

Trivial merge