From: ppisa <pisa@cmp.felk.cvut.cz>
Date: Fri, 30 Jan 2009 18:45:23 +0000 (+0100)
Subject: Merge commit 'sf-ocera-lincan/master'
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/commitdiff_plain/2e85655fb38062be1ac12541077db4d178122f94

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

2e85655fb38062be1ac12541077db4d178122f94