From: Richard Purdie <rpurdie@rpsys.net>
Date: Wed, 14 Jun 2006 23:57:56 +0000 (+0000)
Subject: merge of 619c2a2f86cda6fa47d337c32bb59fd59bfd2697
X-Git-Tag: Release-2010-05/1~9453^2~1459^2~4^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fc9beec2c099a3179d3407aeb18a6f84e1696e93;p=openembedded.git

merge of 619c2a2f86cda6fa47d337c32bb59fd59bfd2697
     and 6c5f6dd92dc9e167c3598305801931820379802a
---

fc9beec2c099a3179d3407aeb18a6f84e1696e93