Merge commit 'sf-ocera-lincan/master'
authorppisa <pisa@cmp.felk.cvut.cz>
Sun, 1 Mar 2009 10:42:35 +0000 (11:42 +0100)
committerppisa <pisa@cmp.felk.cvut.cz>
Sun, 1 Mar 2009 10:42:35 +0000 (11:42 +0100)

Trivial merge