From: ppisa <pisa@cmp.felk.cvut.cz>
Date: Sun, 1 Mar 2009 10:42:35 +0000 (+0100)
Subject: Merge commit 'sf-ocera-lincan/master'
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/commitdiff_plain/6236aafe41e4d802499433b9bcf11db9e2c6492e?hp=-c

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

6236aafe41e4d802499433b9bcf11db9e2c6492e