From: Rod Whitby <rod@whitby.id.au>
Date: Wed, 6 Sep 2006 11:46:14 +0000 (+0000)
Subject: merge of 6be0c561dac329e3cd7624dfd7f1133f9af8ae63
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
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=00e4636dc51f2893a35e652bbbeef8b5dda4cebe;p=openembedded.git

merge of 6be0c561dac329e3cd7624dfd7f1133f9af8ae63
     and b138a722ca5b0022bd97e129304ae79ba187c89b
---

00e4636dc51f2893a35e652bbbeef8b5dda4cebe