From: Justin Patrin <papercrane@gmail.com>
Date: Thu, 1 Sep 2005 21:46:29 +0000 (+0000)
Subject: merge of 6dd4b1d7e7f2b41926f77732f5d5ea0320d125e7
X-Git-Tag: Release-2010-05/1~9453^2~3649^2~13
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4b5b3211cb2800932411d26f0daa271859a0417a;p=openembedded.git

merge of 6dd4b1d7e7f2b41926f77732f5d5ea0320d125e7
     and c0acc534da9ee6ea1b4881cb97790ae7dadee8e8
---

4b5b3211cb2800932411d26f0daa271859a0417a