Merge branch 'master' of rtime.felk.cvut.cz:/can-benchmark
authorMichal Sojka <sojkam1@fel.cvut.cz>
Sat, 18 Dec 2010 20:24:30 +0000 (21:24 +0100)
committerMichal Sojka <sojkam1@fel.cvut.cz>
Sat, 18 Dec 2010 20:24:30 +0000 (21:24 +0100)

Trivial merge