Merge branch 'master' of rtime.felk.cvut.cz:/can-benchmark
authorMichal Sojka <sojkam1@fel.cvut.cz>
Sun, 28 Nov 2010 10:40:29 +0000 (11:40 +0100)
committerMichal Sojka <sojkam1@fel.cvut.cz>
Sun, 28 Nov 2010 10:40:29 +0000 (11:40 +0100)

Trivial merge