From: Richard Purdie <rpurdie@rpsys.net>
Date: Tue, 25 Oct 2005 20:49:27 +0000 (+0000)
Subject: merge of 83e8fa36e700a05b7fa4788c83380a4bf023e8f1
X-Git-Tag: Release-2010-05/1~9453^2~3187
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5b68988ef49c2b21de2220a8449663d5e52b1a77;p=openembedded.git

merge of 83e8fa36e700a05b7fa4788c83380a4bf023e8f1
     and f4799c6524a23c38df298781ba56839163a0ea50
---

5b68988ef49c2b21de2220a8449663d5e52b1a77