Merge remote-tracking branch 'origin/lucca-tests-bench' into lucca-tests-bench
authorLucca Hirschi <lucca.hirschi@gmail.com>
Wed, 18 Jul 2012 12:04:31 +0000 (14:04 +0200)
committerLucca Hirschi <lucca.hirschi@gmail.com>
Wed, 18 Jul 2012 12:04:31 +0000 (14:04 +0200)

Trivial merge