Merge commit 'sf-ocera-lincan/master'
authorppisa <pisa@cmp.felk.cvut.cz>
Fri, 30 Jan 2009 18:45:23 +0000 (19:45 +0100)
committerppisa <pisa@cmp.felk.cvut.cz>
Fri, 30 Jan 2009 18:45:23 +0000 (19:45 +0100)

Trivial merge