From: Toni Jussila <toni.jussila@fudeco.com>
Date: Wed, 17 Mar 2010 10:11:09 +0000 (+0200)
Subject: Merge branch 'master' of https://vcs.maemo.org/git/speedfreak
X-Git-Tag: v0.1~40
X-Git-Url: https://vcs.maemo.org/git/?a=commitdiff_plain;h=cd00a43ecd3bc1a2e5fb021582abc778e714bc96;p=speedfreak

Merge branch 'master' of https://vcs.maemo.org/git/speedfreak

Conflicts:
	Client/UI.pro
---

cd00a43ecd3bc1a2e5fb021582abc778e714bc96