Merge commit 'sf-ocera-lincan/master'
authorppisa <pisa@cmp.felk.cvut.cz>
Sun, 9 Nov 2008 12:26:13 +0000 (13:26 +0100)
committerppisa <pisa@cmp.felk.cvut.cz>
Sun, 9 Nov 2008 12:26:13 +0000 (13:26 +0100)

Trivial merge