From: ppisa <pisa@cmp.felk.cvut.cz>
Date: Sun, 23 Nov 2008 22:46:25 +0000 (+0100)
Subject: Merge commit 'sf-ocera-lincan/master'
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/commitdiff_plain/5a5faefde7751e7fec5016059175b6f1109b914a

Merge commit 'sf-ocera-lincan/master'
---

5a5faefde7751e7fec5016059175b6f1109b914a