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

Trivial merge