Merge branch 'master' of git.omp.am:/home/omp/git/conky
authorCesare Tirabassi <norsetto@ubuntu.com>
Sat, 11 Jul 2009 19:37:54 +0000 (21:37 +0200)
committerCesare Tirabassi <norsetto@ubuntu.com>
Sat, 11 Jul 2009 19:37:54 +0000 (21:37 +0200)

Trivial merge