From 31fcdfb965de411dba45e228a54c074134b8ff28 Mon Sep 17 00:00:00 2001
From: Erik Zandvliet <s.p.the.ghost@gmail.com>
Date: Mon, 17 Jan 2011 16:22:17 +0100
Subject: [PATCH] Merge branch 'master' of projectlivestream.com:pls