commit aa8363716a6d12acb0612dd978cda0f1ec8eca6f Merge: edb9615 cd214dd Author: Gregor Tätzner <gregor at freenet.de> Date: Sun Jan 22 12:44:28 2012 +0100 Merge branch 'master' into f15 ---