Fri, 08 Jul 2011 15:31:46 +0200 Florian Pose merge.
Fri, 08 Jul 2011 14:28:07 +0200 Florian Pose Minor: removed unnecessary return.