Mon, 24 Oct 2011 21:39:34 +0200 Alpar Juttner Merge #428 and #429 to branch 1.1 1.1