Update from si-imac.home.simonszu.de (Do  4 Apr 2013 22:40:07 CEST)
Merge gefixt
Update from si-imac.home.simonszu.de (Do  4 Apr 2013 22:41:53 CEST)