From: Jamie Lenehan <lenehan@twibble.org>
Date: Tue, 30 May 2006 14:20:29 +0000 (+0000)
Subject: merge of 85319fa61d0c4e459749097283b01b6a22ddca01
X-Git-Tag: Release-2010-05/1~9453^2~1558^2~13^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7e869c76a29da07699491dbe9bc73134864e05d6;p=openembedded.git

merge of 85319fa61d0c4e459749097283b01b6a22ddca01
     and 88838f9bcc31f610d3e4816c4727c1d802236945
---

7e869c76a29da07699491dbe9bc73134864e05d6