Merge branch 'master' of rtime.felk.cvut.cz:/can-benchmark
authorMichal Sojka <sojkam1@fel.cvut.cz>
Mon, 29 Nov 2010 14:47:06 +0000 (15:47 +0100)
committerMichal Sojka <sojkam1@fel.cvut.cz>
Mon, 29 Nov 2010 14:47:06 +0000 (15:47 +0100)

Trivial merge