From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 22 Jan 2006 22:43:19 +0000 (+0000)
Subject: merge of 1f08208ff3c43887e64b23c1f616b3c055f659f8
X-Git-Tag: Release-2010-05/1~9453^2~2579
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a106d6b8e80abd2303e40999149be09cdcbafc7c;p=openembedded.git

merge of 1f08208ff3c43887e64b23c1f616b3c055f659f8
     and 5531936b9907566eaf1d648bfbcc4867ba699ccf
---

a106d6b8e80abd2303e40999149be09cdcbafc7c