Merge commit 'sf-ocera-lincan'
authorppisa <pisa@cmp.felk.cvut.cz>
Sun, 2 Nov 2008 11:52:29 +0000 (12:52 +0100)
committerppisa <pisa@cmp.felk.cvut.cz>
Sun, 2 Nov 2008 11:52:29 +0000 (12:52 +0100)

Trivial merge