From: Rod Whitby <rod@whitby.id.au>
Date: Thu, 21 Dec 2006 10:19:35 +0000 (+0000)
Subject: merge of 04fc443fb07deb514c4218a844a23809017c4005
X-Git-Tag: Release-2010-05/1~9453^2~27^2~11^2~2^2^2^2^2~3^2^2^2^2^2~2^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8e1c23570bf48c6e4d880553a654cd23ac5bf2a9;p=openembedded.git

merge of 04fc443fb07deb514c4218a844a23809017c4005
     and 76e7f9f8a56e5ea977d7491ec4871f97befb0507
---

8e1c23570bf48c6e4d880553a654cd23ac5bf2a9