commit 717abd240f9e0163f327bc2e67207ee1810c4654 Merge: beacf72 5744065 Author: Till Maas <opensource at till.name> Date: Tue Aug 17 00:03:08 2010 +0200 Merge branch 'f13' ---