From: Rod Whitby <rod@whitby.id.au>
Date: Sun, 3 Sep 2006 21:01:22 +0000 (+0000)
Subject: merge of 21cf340af525f9fc4a8b71b5ad326f7041619722
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
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6246bb2986e938096cb8252b6c65fc88bd36f418;p=openembedded.git

merge of 21cf340af525f9fc4a8b71b5ad326f7041619722
     and 3ba5f8db83f0545a2d2eb7c22fea2b9a7e8b8213
---

6246bb2986e938096cb8252b6c65fc88bd36f418