From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 22 Dec 2006 19:17:41 +0000 (+0000)
Subject: merge of da3cdfb77d78c30d35dd871b78d9365f8bc3a22d
X-Git-Tag: Release-2010-05/1~9453^2~27^2~11^2~2^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=84439cf96d30453c1ff4f6a65875e3a369a49575;p=openembedded.git

merge of da3cdfb77d78c30d35dd871b78d9365f8bc3a22d
     and e5da7724264150ba0849912120ae0a91de1e10d1
---

84439cf96d30453c1ff4f6a65875e3a369a49575