Merge branch 'master' of rtime.felk.cvut.cz:/can-benchmark
authorMichal Sojka <sojkam1@fel.cvut.cz>
Tue, 7 Dec 2010 18:14:41 +0000 (19:14 +0100)
committerMichal Sojka <sojkam1@fel.cvut.cz>
Tue, 7 Dec 2010 18:14:41 +0000 (19:14 +0100)

Trivial merge