commit da6098b254bdd9045cb894acc8d149e98525d30c
Merge: b28cefcc f2ebcf01
Author: dankert 
Date:   Tue Mar 19 09:37:50 2013 +0100

    Merge nach Pull.