commit 922ca5ac0de407712768433c8d0a3fec80a33a6f Merge: 16dbff9 b3e790c Author: Till Maas <opensource at till.name> Date: Tue Aug 17 00:10:04 2010 +0200 Merge branch 'f12' ---