From: Rod Whitby <rod@whitby.id.au>
Date: Thu, 28 Jul 2005 08:03:42 +0000 (+0000)
Subject: merge of 009ad2ebd87d84a529fa64970aef3233b7733d5e
X-Git-Tag: Release-2010-05/1~9453^2~4005^2~35
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6121f3031da209e3568f565c3216f2923ffd705c;p=openembedded.git

merge of 009ad2ebd87d84a529fa64970aef3233b7733d5e
     and 0850de9cd5fce13fe0304a29f025705350f8ab6e
---

6121f3031da209e3568f565c3216f2923ffd705c