From: Cesare Tirabassi <norsetto@ubuntu.com>
Date: Sat, 30 Jan 2010 18:24:19 +0000 (+0100)
Subject: Merge branch '1.8.0' of git.omp.am:/home/omp/git/conky into 1.8.0
X-Git-Url: http://vcs.maemo.org/git/?a=commitdiff_plain;h=9601693afa581277a41242b863802cacdf642b36;p=monky

Merge branch '1.8.0' of git.omp.am:/home/omp/git/conky into 1.8.0
---

9601693afa581277a41242b863802cacdf642b36