From: Rod Whitby <rod@whitby.id.au>
Date: Wed, 8 Feb 2006 12:22:25 +0000 (+0000)
Subject: merge of 52b2cef3e9fdc9a6bb55fc7a1ed2afea0354680c
X-Git-Tag: Release-2010-05/1~9453^2~2382^2~1^2^2^2~2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=208f7570fc3958419cf514c4ad1ecd14bfdd6562;p=openembedded.git

merge of 52b2cef3e9fdc9a6bb55fc7a1ed2afea0354680c
     and 7ba73700ed732b698e688443c1f964454f76f1e8
---

208f7570fc3958419cf514c4ad1ecd14bfdd6562