commit 16dbff9392772cf58244a435449410aa00e0acfd Merge: ad58bed 5e7d1a0 Author: Till Maas <opensource at till.name> Date: Tue Aug 17 00:10:03 2010 +0200 Merge branch 'f13' ---