commit f490ff89d2575e21183cdfb02df76a45c9225f5f Merge: ee71fa4 6998d57 Author: Jochen Schmitt <Jochen at herr-schmitt.de> Date: Thu Oct 10 20:09:45 2013 +0200 upstream version 2.10.2 ---