commit ad58bed53a4715c482b0118ef0976ba3e94e65a1 Merge: b157c3b 5cb95ac Author: Till Maas <opensource at till.name> Date: Tue Aug 17 00:10:01 2010 +0200 Merge branch 'f14' ---