commit 19bccf2b59475ddf38d985918f2b4eecb73563a1 Merge: 8d201e8 bc7479f Author: Till Maas <opensource at till.name> Date: Mon Aug 16 21:13:41 2010 +0200 Merge branch 'master' into f12 ---