From: Richard Purdie <rpurdie@rpsys.net>
Date: Sun, 14 Aug 2005 09:09:47 +0000 (+0000)
Subject: merge of 3d6e44c78353ac8e4806b7a4d5b0cc3e8cc80be1
X-Git-Tag: Release-2010-05/1~9453^2~3858^2~28^2~1^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4458e8ecee81944fdacb936f168f4f3893c214ff;p=openembedded.git

merge of 3d6e44c78353ac8e4806b7a4d5b0cc3e8cc80be1
     and 70d32a50f2a94ca8fcd33396bcedb441034b9e20
---

4458e8ecee81944fdacb936f168f4f3893c214ff