Merge branch 'master' of rtime.felk.cvut.cz:/can-benchmark
authorMichal Sojka <sojkam1@fel.cvut.cz>
Mon, 6 Dec 2010 10:39:07 +0000 (11:39 +0100)
committerMichal Sojka <sojkam1@fel.cvut.cz>
Mon, 6 Dec 2010 10:39:07 +0000 (11:39 +0100)

Trivial merge