Merge commit 'sf-ocera-lincan/master'
authorppisa <pisa@cmp.felk.cvut.cz>
Fri, 30 Jan 2009 18:45:23 +0000 (19:45 +0100)
committerppisa <pisa@cmp.felk.cvut.cz>
Fri, 30 Jan 2009 18:45:23 +0000 (19:45 +0100)
commit2e85655fb38062be1ac12541077db4d178122f94
treea348d515fda7c43483948cbb6ea6c6f5f519a75c
parent5a5faefde7751e7fec5016059175b6f1109b914a
parentc88af798fcccad5bdd5bbefecde119fd7824efa5
Merge commit 'sf-ocera-lincan/master'