Merge: C_CAN changes
authorppisa <pisa@cmp.felk.cvut.cz>
Thu, 2 Jun 2005 10:58:00 +0000 (12:58 +0200)
committerppisa <pisa@cmp.felk.cvut.cz>
Thu, 2 Jun 2005 10:58:00 +0000 (12:58 +0200)
Merge commit 'remotes/sf-ocera-lincan/master'


Trivial merge