Merge branch 'master' of ssh://geekcave.at:222/parallel
authorsomeone <someone@somenet.org>
Fri, 13 Jan 2012 13:56:40 +0000 (14:56 +0100)
committersomeone <someone@somenet.org>
Fri, 13 Jan 2012 13:56:40 +0000 (14:56 +0100)

Trivial merge