From: Martin Molnar <molnam1@fel.cvut.cz>
Date: Mon, 25 May 2009 19:59:15 +0000 (+0200)
Subject: Merge branch 'demo' of molnam1@rtime.felk.cvut.cz:/var/git/frescor/streamer into... 
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/frescor/streamer.git/commitdiff_plain/f69628ede00a89b3449f4f513829975f6dc51de8

Merge branch 'demo' of molnam1@rtime.felk.cvut.cz:/var/git/frescor/streamer into demo
---

f69628ede00a89b3449f4f513829975f6dc51de8