Merge: Updated for adlink7841
authorppisa <pisa@cmp.felk.cvut.cz>
Thu, 10 Feb 2005 10:45:00 +0000 (11:45 +0100)
committerppisa <pisa@cmp.felk.cvut.cz>
Thu, 10 Feb 2005 10:45:00 +0000 (11:45 +0100)
Merge commit 'remotes/sf-ocera-lincan/master'


Trivial merge