Merge branch 'master' of rtime.felk.cvut.cz:/can-benchmark
authorMichal Sojka <sojkam1@fel.cvut.cz>
Thu, 2 Dec 2010 00:17:06 +0000 (01:17 +0100)
committerMichal Sojka <sojkam1@fel.cvut.cz>
Thu, 2 Dec 2010 00:17:06 +0000 (01:17 +0100)

Trivial merge