Merge branch 'master' of rtime.felk.cvut.cz:/can-benchmark
authorMichal Sojka <sojkam1@fel.cvut.cz>
Tue, 30 Nov 2010 12:12:15 +0000 (13:12 +0100)
committerMichal Sojka <sojkam1@fel.cvut.cz>
Tue, 30 Nov 2010 12:12:15 +0000 (13:12 +0100)

Trivial merge