Squashed commit of the following:

commit 54b723d2e08ca2af393d6eaa606d047431612453
Author: Jan Renz <j.renz@digiden.de>
Date:   Fri Feb 1 15:33:33 2013 +0100

    * test