From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 1 Sep 2006 19:03:15 +0000 (+0000)
Subject: merge of 36d801d604bcf18d92151a23095caa49c3c0e07c
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^2~5^2~1^2^2~1^2^2~2^2~1^2^2^2^2~1^2~2^2^2~1^2^2^2^2~1^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fe605e89a753dfdd7bd4d9804f041f0a07cfef8d;p=openembedded.git

merge of 36d801d604bcf18d92151a23095caa49c3c0e07c
     and 5973cff7074d3746ce1b548caf58e7dd6aae2826
---

fe605e89a753dfdd7bd4d9804f041f0a07cfef8d