From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Wed, 24 Aug 2005 19:37:43 +0000 (+0000)
Subject: merge of 1d77ddb01c67323571ab7dbd94f8697e79915a6c
X-Git-Tag: Release-2010-05/1~9453^2~3804^2~3
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=44b21ada29515bef4ce6ebd3ce33eebe99370043;p=openembedded.git

merge of 1d77ddb01c67323571ab7dbd94f8697e79915a6c
     and ef94291fe767aba5f533204f38ff66f144dba2ff
---

44b21ada29515bef4ce6ebd3ce33eebe99370043