From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Thu, 22 Sep 2005 14:12:48 +0000 (+0000)
Subject: merge of f81152e068aff509b6a52bcc8ada77a0a0c1f09e
X-Git-Tag: Release-2010-05/1~9453^2~3471
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=39a883f9a0f74d9c33f7f9f72bf497264265c97d;p=openembedded.git

merge of f81152e068aff509b6a52bcc8ada77a0a0c1f09e
     and ab4108f74e6e141a9205e560ab76a02ddff2604f
---

39a883f9a0f74d9c33f7f9f72bf497264265c97d