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

merge of 63ed41d76f8dfaf354b6d3cb63030e21615724aa
     and fdfebdd28e61ad95af198e9e89ea98fa9b5279c1
---

6f82620c320b6a61c08ffcf80f703841d0f6b30e