From: ppisa <pisa@cmp.felk.cvut.cz>
Date: Mon, 30 May 2005 22:45:00 +0000 (+0200)
Subject: Merge: The CR line ending characters removed.
X-Git-Tag: CLT_COMM_CAN_usb_can1_kriz_bp~66
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/commitdiff_plain/9b3703780b629a10e3f9ace1be7b1f9557cb2402?hp=-c

Merge: The CR line ending characters removed.

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

9b3703780b629a10e3f9ace1be7b1f9557cb2402