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

merge of da6affcdbf0208b7dfea0a8524ab5c6b2a6b2439
     and e7290af9d0e9df3b27cb4b84e356083c3df2231e
---

de400d6a449f2e4d0d995972236a4a4819eb2ff0