From cdfa38513103f0c4c8b43c3361e41e40028a134d Mon Sep 17 00:00:00 2001
From: Erik Zandvliet <immortal@localhost.(none)>
Date: Tue, 20 Jul 2010 15:32:17 +0200
Subject: [PATCH] Merge branch 'master' of projectlivestream.com:pls