Merge commit 'sf-ocera-lincan/master'
authorppisa <pisa@cmp.felk.cvut.cz>
Sun, 23 Nov 2008 22:46:25 +0000 (23:46 +0100)
committerppisa <pisa@cmp.felk.cvut.cz>
Sun, 23 Nov 2008 22:46:25 +0000 (23:46 +0100)

Trivial merge