Merge: The configuration control file for in OCERA tree build updated.
authorppisa <pisa@cmp.felk.cvut.cz>
Thu, 13 Jul 2006 20:47:00 +0000 (22:47 +0200)
committerppisa <pisa@cmp.felk.cvut.cz>
Thu, 13 Jul 2006 20:47:00 +0000 (22:47 +0200)
Merge commit 'remotes/sf-ocera-lincan/master'


Trivial merge