From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 29 Dec 2006 12:03:38 +0000 (+0000)
Subject: merge of 00ab42cecad6f3cff7e430dfe1e456ffab6ee08c
X-Git-Tag: Release-2010-05/1~9453^2~34^2~1^2~1^2~1^2~1^2^2^2^2^2^2^2^2~1^2^2^2~2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c8b4cbeb4ebadf3921afa0ff3d82f0966268f67f;p=openembedded.git

merge of 00ab42cecad6f3cff7e430dfe1e456ffab6ee08c
     and 08852d3ee921e5b54ef924285cd0ed124cb83e31
---

c8b4cbeb4ebadf3921afa0ff3d82f0966268f67f