From: tmarki <tmarki@gmail.com>
Date: Fri, 20 Aug 2010 12:07:49 +0000 (+0200)
Subject: Merge branch 'alpha' of tomsrv:tomamp into alpha
X-Git-Url: https://vcs.maemo.org/git/?p=tomamp;a=commitdiff_plain;h=61c90b6a13ee2b25fa08d9322ed8bf0597ee2cde

Merge branch 'alpha' of tomsrv:tomamp into alpha
---

61c90b6a13ee2b25fa08d9322ed8bf0597ee2cde