From c251dd367fda57fae5321a492bfad3fb3912752b Mon Sep 17 00:00:00 2001
From: Hendrik Leppkes <h.leppkes@gmail.com>
Date: Sat, 3 May 2008 17:08:28 +0000
Subject: [PATCH] merge to trunk