commit 97a668d36ec3bf9d912667bec5623318d1a8d384 Merge: 7a47953 bc7479f Author: Till Maas <opensource at till.name> Date: Mon Aug 16 21:07:57 2010 +0200 Merge branch 'master' into f14 ---