From: Lars Op den Kamp <lars@opdenkamp.eu>
Date: Fri, 21 Jan 2011 00:34:46 +0000 (+0100)
Subject: Merge remote branch 'upstream/master'
X-Git-Tag: Eden_beta1~1861
X-Git-Url: http://code.vuplus.com/gitweb/?a=commitdiff_plain;h=6a4f42d9c21028ae5006ab69592d3a5590075a39;p=vuplus_xbmc

Merge remote branch 'upstream/master'
---

6a4f42d9c21028ae5006ab69592d3a5590075a39