commit 1542912c53e1a5a62639605c64ee553d1e043342 Merge: 7542c67 faaa6bd Author: Till Maas <opensource at till.name> Date: Mon Aug 16 23:55:12 2010 +0200 Merge branch 'f14' ---