From: Ionutz Borcoman <iborco@gmail.com>
Date: Sun, 20 Mar 2011 11:44:33 +0000 (+0200)
Subject: Merge branch 'sphinx'
X-Git-Tag: 0.8.3~2
X-Git-Url: http://git.maemo.org/git/?p=simple-xmbc-rem;a=commitdiff_plain;h=cb83e96293869b0bfec082fcb3900ffda3124a8b

Merge branch 'sphinx'
---

cb83e96293869b0bfec082fcb3900ffda3124a8b