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

merge of 1f23f78bb018ef9ead8f831e7653c095cbe8c3ae
     and b567e2cc931d36f704f32c2c731b800fa6b83a18
---

a11765c6d7508a96a2974b6be41c47f2124b0267