From: Richard Purdie <rpurdie@rpsys.net>
Date: Wed, 29 Nov 2006 12:19:17 +0000 (+0000)
Subject: merge of '36827e88b7d0394a63c9f1f96bd021aa80fd443c'
X-Git-Tag: Release-2010-05/1~9453^2~232
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=abe440b3722a6cecef27b786783a8e434d6d32de;p=openembedded.git

Merge ... '36827e88b7d0394a63c9f1f96bd021aa80fd443c'
     and 'f48c65e31adb332378372f7b45393669354ca0f4'
---

abe440b3722a6cecef27b786783a8e434d6d32de