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)
commita1ec28fb35aed9b0be19ff7963d406ca400e6488
treea26901378d1c759e7248d766a788c8ca4dd6acb9
parenta3c0df136f4c2dd5b66ff543c336095ab2cbfb23
parent4cc43a29db01ddce86e6ca9e2b08d38f3f004653
Merge: Updated for adlink7841

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