From: Rod Whitby <rod@whitby.id.au>
Date: Wed, 6 Sep 2006 10:46:27 +0000 (+0000)
Subject: merge of 18951ff4809c89983fbc5eab164597d7d254041c
X-Git-Tag: Release-2010-05/1~9453^2~876^2~12^2~1^2~1^2^2^2~1^2^2~1^2^2^2~1^2^2~1^2^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c4b9d7b7eabb89bf131023b8125b995b38fc403a;p=openembedded.git

merge of 18951ff4809c89983fbc5eab164597d7d254041c
     and f1efa8a84381fd48e812829cb2440952e720bfd1
---

c4b9d7b7eabb89bf131023b8125b995b38fc403a