From: Rod Whitby <rod@whitby.id.au>
Date: Thu, 21 Dec 2006 11:32:24 +0000 (+0000)
Subject: merge of a3ed3473c082ebf75ecc350ebbd0c832e9faaf1a
X-Git-Tag: Release-2010-05/1~9453^2~27^2~11^2~2^2^2^2^2~3^2^2^2^2^2~2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4e59967e29ea9c026489a85e9818049dbd98e387;p=openembedded.git

merge of a3ed3473c082ebf75ecc350ebbd0c832e9faaf1a
     and d3b644b9c422f6f7bd0583dec47febae4c479338
---

4e59967e29ea9c026489a85e9818049dbd98e387