commit c50296430e4f0822feb1166a93a910a2129efbba Merge: 17ea473 58f3a8f Author: Till Maas <opensource at till.name> Date: Mon Aug 23 21:30:49 2010 +0200 Merge branch 'f12' ---