From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Wed, 7 Sep 2005 09:46:09 +0000 (+0000)
Subject: merge of f1ee0327eee91259e262ed28b04a96ddf20d8b7c
X-Git-Tag: Release-2010-05/1~9453^2~3624
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=60e4096ee61a290969982df4a22d53a4fc56cd34;p=openembedded.git

merge of f1ee0327eee91259e262ed28b04a96ddf20d8b7c
     and f987f3f02d0566836caf6a5ae54ac223d0a97609
---

60e4096ee61a290969982df4a22d53a4fc56cd34