Merge branch 'master' of https://git.maemo.org/projects/zukebox
authorHenry Bilby <henrymiller.engenheiro@gmail.com>
Thu, 4 Jun 2009 05:41:37 +0000 (01:41 -0400)
committerHenry Bilby <henrymiller.engenheiro@gmail.com>
Thu, 4 Jun 2009 05:41:37 +0000 (01:41 -0400)

Trivial merge