From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 3 Dec 2007 19:44:05 +0000 (+0000)
Subject: merge of '49fb48a813e1e0d599f74dd7a809922ab71939b1'
X-Git-Tag: Release-2010-05/1~8236
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4dc92f941e3afe632a0f08909713a0279ef9d2d5;p=openembedded.git

Merge ... '49fb48a813e1e0d599f74dd7a809922ab71939b1'
     and '6fe2cd0b60b675a1e3118d25934adb4693f3b8ed'
---

4dc92f941e3afe632a0f08909713a0279ef9d2d5