Merge branch 'WIP/test_performance'
authorSebastian Spaeth <Sebastian@SSpaeth.de>
Tue, 8 Jan 2013 15:57:15 +0000 (16:57 +0100)
committerSebastian Spaeth <Sebastian@SSpaeth.de>
Tue, 8 Jan 2013 15:57:15 +0000 (16:57 +0100)

Trivial merge