Merge: The CR line ending characters removed.
authorppisa <pisa@cmp.felk.cvut.cz>
Mon, 30 May 2005 22:49:00 +0000 (00:49 +0200)
committerppisa <pisa@cmp.felk.cvut.cz>
Mon, 30 May 2005 22:49:00 +0000 (00:49 +0200)
Merge commit 'remotes/sf-ocera-lincan/master'


Trivial merge