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)

Trivial merge