From: Jamie Lenehan <lenehan@twibble.org>
Date: Fri, 23 Jun 2006 01:06:26 +0000 (+0000)
Subject: merge of 006ff5c889f07b22718fa73951084ab94aba16aa
X-Git-Tag: Release-2010-05/1~9453^2~1429^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2854340a2866bf2b4825b802960d8cb05912ca56;p=openembedded.git

merge of 006ff5c889f07b22718fa73951084ab94aba16aa
     and 1526da957aace3f1e2502307c4d8877090168c67
---

2854340a2866bf2b4825b802960d8cb05912ca56