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

merge of 569bc333a2fd0e29914ba6a7e70ec5453c9c0618
     and a3b16e7432a5fa5e274d4bd9a81e933a37a23946
---

ebe36b66bc1dcba2f68330bce817c48f5051a1e4