From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Sun, 18 Sep 2005 15:18:33 +0000 (+0000)
Subject: merge of a8e888a8558f7e09b0116a15e86437cbee47b180
X-Git-Tag: Release-2010-05/1~9453^2~3496
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=daf87f10c7967670ac52ef43178da19e278ad919;p=openembedded.git

merge of a8e888a8558f7e09b0116a15e86437cbee47b180
     and b9817db6eb0bf96c168e419003466c7235191838
---

daf87f10c7967670ac52ef43178da19e278ad919