Merge branch 'master' of rtime.felk.cvut.cz:/can-benchmark
authorMichal Sojka <sojkam1@fel.cvut.cz>
Wed, 16 Feb 2011 08:20:03 +0000 (09:20 +0100)
committerMichal Sojka <sojkam1@fel.cvut.cz>
Wed, 16 Feb 2011 08:20:03 +0000 (09:20 +0100)

Trivial merge