From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Sun, 28 Aug 2005 17:31:37 +0000 (+0000)
Subject: merge of 43a935492122ead17599e6b8bbd908eef4279ddd
X-Git-Tag: Release-2010-05/1~9453^2~3756
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d92a6a731de75b942f28c485c0eaaa6cd6d40c1c;p=openembedded.git

merge of 43a935492122ead17599e6b8bbd908eef4279ddd
     and 776c3604a5a1d27cc6a876ada6960ab32f81fb5d
---

d92a6a731de75b942f28c485c0eaaa6cd6d40c1c