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

Trivial merge