From: Justin Patrin <papercrane@gmail.com>
Date: Tue, 18 Oct 2005 21:28:46 +0000 (+0000)
Subject: merge of 0967efd07b22c9bc660b86824d4c3a888f0d9e4a
X-Git-Tag: Release-2010-05/1~9453^2~3235
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c59ab5ea95e7f6735db9b7ebbc304be39be7885d;p=openembedded.git

merge of 0967efd07b22c9bc660b86824d4c3a888f0d9e4a
     and 7b483e2e04e0fbbaf5a7d86cc57455420540e5fa
---

c59ab5ea95e7f6735db9b7ebbc304be39be7885d