Merge commit 'sf-ocera-lincan/master'
authorppisa <pisa@cmp.felk.cvut.cz>
Sat, 8 Nov 2008 23:16:07 +0000 (00:16 +0100)
committerppisa <pisa@cmp.felk.cvut.cz>
Sat, 8 Nov 2008 23:16:07 +0000 (00:16 +0100)

Trivial merge