Merge branch 'master' of rtime.felk.cvut.cz:/can-benchmark
authorMichal Sojka <sojka@os.inf.tu-dresden.de>
Mon, 1 Aug 2011 22:21:58 +0000 (00:21 +0200)
committerMichal Sojka <sojka@os.inf.tu-dresden.de>
Mon, 1 Aug 2011 22:21:58 +0000 (00:21 +0200)

Trivial merge