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

merge of 769a800deeefc4e439b5bc9c6cf9abd2a6dde254
     and 918d376ebc00bbed8c1aa2ba0e64dfde3039bb16
---

33cc88b4e01f0eafed5c238b6c7f8d4847cde0aa