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)
commit5527fa35c8454e946368dfb873eec9cd9162fa18
tree6c40c35c584295fc1e987ebd63de98df2e2d5d70
parent9b3703780b629a10e3f9ace1be7b1f9557cb2402
parent8b8d26b693cd343024ab0853ab8a506bca3863a9
Merge: The CR line ending characters removed.

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