From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 8 Dec 2006 10:46:58 +0000 (+0000)
Subject: merge of 04e2b1d31e319303e9ffe6290c649f8c0cbdb552
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~1^2^2^2^2^2~4^2~2^2~3^2^2~1^2~1^2^2~2^2~4^2^2^2~1^2~2^2~1^2~1^2^2~1^2^2^2^2~6^2^2^2^2~3^2^2~3^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b3fa3662ff31cf08fc3c659357192e15df00835a;p=openembedded.git

merge of 04e2b1d31e319303e9ffe6290c649f8c0cbdb552
     and 9d544440ad5826495799ed73712a07f1beede37b
---

b3fa3662ff31cf08fc3c659357192e15df00835a