Merge: Updated for 0.3.1 release
authorppisa <pisa@cmp.felk.cvut.cz>
Wed, 13 Jul 2005 19:44:00 +0000 (21:44 +0200)
committerppisa <pisa@cmp.felk.cvut.cz>
Wed, 13 Jul 2005 19:44:00 +0000 (21:44 +0200)
Merge commit 'remotes/sf-ocera-lincan/master'


Trivial merge