Merge branch 'master' of https://vcs.maemo.org/git/tomamp
authortmarki <tmarki@gmail.com>
Fri, 20 Aug 2010 17:04:18 +0000 (19:04 +0200)
committertmarki <tmarki@gmail.com>
Fri, 20 Aug 2010 17:04:18 +0000 (19:04 +0200)
commit7c2cbacf244beba26935fddd025578bd413dd76f
tree7f0cb1d79cc8b0925aa1f07a02edbcec7a097efa
parent0006d9da1cff90b69338d13f7e2d6f50340b02c9
parentf94441b15e9b286227478456a4ae02cf3ad15cd7
Merge branch 'master' of https://vcs.maemo.org/git/tomamp