From fe4405c8363ade7336a04a39df19a899a1ec6d0d Mon Sep 17 00:00:00 2001
From: Stein Magnus Jodal <stein.magnus@jodal.no>
Date: Mon, 1 Feb 2010 09:57:03 +0100
Subject: [PATCH] Merge branches 'master' and 'master' of
 git@github.com:jodal/mopidy