Merge branch 'master' of rtime.felk.cvut.cz:/can-benchmark
authorMichal Sojka <sojkam1@fel.cvut.cz>
Tue, 20 Sep 2011 19:59:55 +0000 (21:59 +0200)
committerMichal Sojka <sojkam1@fel.cvut.cz>
Tue, 20 Sep 2011 19:59:55 +0000 (21:59 +0200)

Trivial merge