From: Justin Patrin <papercrane@gmail.com>
Date: Tue, 23 Aug 2005 22:17:00 +0000 (+0000)
Subject: merge of 269ecf74ab47710eabc0ef60b75f09342ff542c8
X-Git-Tag: Release-2010-05/1~9453^2~3836
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3a2ed1fbdfa83cb69c6a1bf1311050070d7a97d7;p=openembedded.git

merge of 269ecf74ab47710eabc0ef60b75f09342ff542c8
     and bb52b63c802dd04d7feac4964f561b985cdb7247
---

3a2ed1fbdfa83cb69c6a1bf1311050070d7a97d7