Merge branch 'master' of https://git.maemo.org/projects/zukebox
authorAndré L. V. Loureiro <loureiro.andrew@gmail.com>
Fri, 29 May 2009 23:25:37 +0000 (19:25 -0400)
committerAndré L. V. Loureiro <loureiro.andrew@gmail.com>
Fri, 29 May 2009 23:25:37 +0000 (19:25 -0400)
commit9975e5c85fd38b7dc37ba4329ca66fb76e6f694e
tree70a15eb4836ec6af6fc5deea14f83b1ff1ca6327
parentf3285016dddce451226caba969f8851ca8cf01bb
parent0133f950585615e9a60eb42ded4188fb89d7db42
Merge branch 'master' of https://git.maemo.org/projects/zukebox