From: Raymond Danks <raymond@edanks.com>
Date: Thu, 1 Jun 2006 22:23:14 +0000 (+0000)
Subject: merge of 12fab859e46a5b7c800c685dd8a3595e6e74c5e7
X-Git-Tag: Release-2010-05/1~9453^2~1512^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c9eb57c3b587c4c970ae41116870b1cf14e8cd62;p=openembedded.git

merge of 12fab859e46a5b7c800c685dd8a3595e6e74c5e7
     and de70e38331c91d4268c0efce6bebf0cb4d762a6d
---

c9eb57c3b587c4c970ae41116870b1cf14e8cd62