From: Lars Op den Kamp <lars@opdenkamp.eu>
Date: Sun, 16 Jan 2011 22:15:36 +0000 (+0100)
Subject: Merge remote branch 'upstream/master'
X-Git-Tag: Eden_beta1~1876
X-Git-Url: http://code.vuplus.com/gitweb/?a=commitdiff_plain;h=0be24733539c14f5f3df97cb8dfb15f2cf86dadc;p=vuplus_xbmc

Merge remote branch 'upstream/master'
---

0be24733539c14f5f3df97cb8dfb15f2cf86dadc