commit 17ea473fdaf3e83f29a8d3f441dae1bbf62b1646 Merge: 168aad5 7fc47a5 Author: Till Maas <opensource at till.name> Date: Mon Aug 23 21:30:48 2010 +0200 Merge branch 'f13' ---