From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 22 Oct 2005 18:38:51 +0000 (+0000)
Subject: merge of 0301ca2b29fe2554d791cb230b33104946f9d50b
X-Git-Tag: Release-2010-05/1~9453^2~3218^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0eeba2217db989370fddf7a3b710303f7e755eed;p=openembedded.git

merge of 0301ca2b29fe2554d791cb230b33104946f9d50b
     and 435eda25fcea43b6f5ea1c355dee46e99dcecf85
---

0eeba2217db989370fddf7a3b710303f7e755eed