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

Trivial merge