From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 29 Dec 2006 19:17:00 +0000 (+0000)
Subject: merge of f03a533684fde29af8a23703055c06f071458ab1
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~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f1da18584dbc281f5786d6faf0c7e39530d4c438;p=openembedded.git

merge of f03a533684fde29af8a23703055c06f071458ab1
     and fe8aa989bb329724151b1ae11e021e80ec7ff5f5
---

f1da18584dbc281f5786d6faf0c7e39530d4c438