From: Justin Patrin <papercrane@gmail.com>
Date: Mon, 22 Aug 2005 20:50:44 +0000 (+0000)
Subject: merge of 691f0a578002a1d669bfbee72d4a577ba19f5509
X-Git-Tag: Release-2010-05/1~9453^2~3849^2~2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5099863a47319b3cb63dd56c98ce7829826834f1;p=openembedded.git

merge of 691f0a578002a1d669bfbee72d4a577ba19f5509
     and c456324f80138ac3564996d0741d738f1fafa406
---

5099863a47319b3cb63dd56c98ce7829826834f1