Merge: Ronald Gomes from Technologic Systemscontributed support for TS-CAN1 and TS...
authorppisa <pisa@cmp.felk.cvut.cz>
Thu, 17 Nov 2005 14:36:00 +0000 (15:36 +0100)
committerppisa <pisa@cmp.felk.cvut.cz>
Thu, 17 Nov 2005 14:36:00 +0000 (15:36 +0100)
Merge commit 'remotes/sf-ocera-lincan/master'


Trivial merge