From: Richard Purdie <rpurdie@rpsys.net>
Date: Mon, 20 Nov 2006 14:33:19 +0000 (+0000)
Subject: merge of '6b50eeffe6b0887666782f657e8f8fc694b7045c'
X-Git-Tag: Release-2010-05/1~9453^2~399
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=38712c59090394d295677f9a6d3fa019373f4ce5;p=openembedded.git

Merge ... '6b50eeffe6b0887666782f657e8f8fc694b7045c'
     and 'c647d36367af59b2cc5bdd6d28a4c0a873539f76'
---

38712c59090394d295677f9a6d3fa019373f4ce5