Merge branch 'master' of rtime.felk.cvut.cz:/can-benchmark
authorMichal Sojka <sojkam1@fel.cvut.cz>
Fri, 17 Dec 2010 15:57:59 +0000 (16:57 +0100)
committerMichal Sojka <sojkam1@fel.cvut.cz>
Fri, 17 Dec 2010 15:57:59 +0000 (16:57 +0100)

Trivial merge