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

merge of 379e31e32bb43c6e86d417f97cb19d13cfb16b6a
     and 9c307d34e162395d96ddb6e808059ea8c3361f74
---

a6215a657bdf59f1a1b695e9de55f72047bcfc84