Merge branch 'master' of git.omp.am:/home/omp/git/conky
authorCesare Tirabassi <norsetto@ubuntu.com>
Sat, 14 Nov 2009 14:58:06 +0000 (15:58 +0100)
committerCesare Tirabassi <norsetto@ubuntu.com>
Sat, 14 Nov 2009 14:58:06 +0000 (15:58 +0100)

Trivial merge