Merge: The CR line ending characters removed.
authorppisa <pisa@cmp.felk.cvut.cz>
Mon, 30 May 2005 22:45:00 +0000 (00:45 +0200)
committerppisa <pisa@cmp.felk.cvut.cz>
Mon, 30 May 2005 22:45:00 +0000 (00:45 +0200)
commit9b3703780b629a10e3f9ace1be7b1f9557cb2402
treefbae8e8a7cf7984c8aa27905db610ddb16e7bbdf
parent788c3cf8927276615d7f30fa2409eb9baac4f6ce
parent0779bed589edeba124307007eb904e8b553d8062
Merge: The CR line ending characters removed.

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