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