From: Rod Whitby <rod@whitby.id.au>
Date: Tue, 2 Aug 2005 02:45:26 +0000 (+0000)
Subject: merge of 7893ffcc366c146ed8222f1853a05c48f8988a4e
X-Git-Tag: Release-2010-05/1~9453^2~4011^2~4^2~4
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f75733be75f571fc2694e30402e8851485b73578;p=openembedded.git

merge of 7893ffcc366c146ed8222f1853a05c48f8988a4e
     and 9ef371d5ab888cd926919c7bf505d283e4f19f54
---

f75733be75f571fc2694e30402e8851485b73578