From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 14 Apr 2006 06:41:25 +0000 (+0000)
Subject: merge of 5b0c87dfefec47f10f9612971a5e7d096e958d8b
X-Git-Tag: Release-2010-05/1~9453^2~1935^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f65285a79a3db5abbc28efe7cd61f36bce3a898d;p=openembedded.git

merge of 5b0c87dfefec47f10f9612971a5e7d096e958d8b
     and bf0b47a698b3ec5b7378374bc16f3680fdcf22a5
---

f65285a79a3db5abbc28efe7cd61f36bce3a898d