Merge commit 'sf-ocera-lincan/master'
authorppisa <pisa@cmp.felk.cvut.cz>
Sat, 28 Feb 2009 13:22:12 +0000 (14:22 +0100)
committerppisa <pisa@cmp.felk.cvut.cz>
Sat, 28 Feb 2009 13:22:12 +0000 (14:22 +0100)

Trivial merge