Merge commit 'origin/master' into mandriva
authorP. Christeas <p_christ@hol.gr>
Thu, 25 Sep 2008 09:30:38 +0000 (12:30 +0300)
committerP. Christeas <p_christ@hol.gr>
Thu, 25 Sep 2008 09:30:38 +0000 (12:30 +0300)
bzr revid: p_christ@hol.gr-20080925093038-ut9sv4xnmm3zsu75


Trivial merge