From: Rod Whitby <rod@whitby.id.au>
Date: Tue, 19 Dec 2006 17:47:47 +0000 (+0000)
Subject: merge of 13bb4c8ba3175c16be87c9c51595f35e125fb447
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~2^2~6^2^2~1^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a19723ab5ce76561ef7c70f4a0651b7c0b78d154;p=openembedded.git

merge of 13bb4c8ba3175c16be87c9c51595f35e125fb447
     and 2cc566f5ecd1293f846e7d96c9d275142d273fb8
---

a19723ab5ce76561ef7c70f4a0651b7c0b78d154