From: Justin Patrin <papercrane@gmail.com>
Date: Thu, 11 Aug 2005 17:23:26 +0000 (+0000)
Subject: merge of 5381d172a27c05bdc841a6ebf55d265354d4e66e
X-Git-Tag: Release-2010-05/1~9453^2~3920^2~8
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6260957232d71b798ac99a445d22d661fed51485;p=openembedded.git

merge of 5381d172a27c05bdc841a6ebf55d265354d4e66e
     and aa3fea219016be801feb5329869cd546a2334ec9
---

6260957232d71b798ac99a445d22d661fed51485