commit 1732698165f3aa2989d5dbbadc4ec2ff24809e31 Merge: dd640ef... 10ca21a... Author: Stefan Hornburg (Racke) <racke at linuxia.de> Date: Fri Sep 17 11:16:20 2010 +0200 Merge branch 'master' into zoom ---