commit 067f1081cf486917087579e1944da881619e7da8 Merge: e9aaa45 79c10ab Author: Martin Gansser <mgansser at alice.de> Date: Sun May 5 12:47:23 2013 +0200 Merge branch 'master' into f18 ---