From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Fri, 27 Jul 2007 21:06:40 +0000 (+0000)
Subject: merge of '2b681d4d3c3fb23e8f08c334e16c595fa671c384'
X-Git-Tag: Release-2010-05/1~8868^2~66^2~40^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a0a17d54ae3dfdf9acf1a339650701fe83efb500;p=openembedded.git

Merge ... '2b681d4d3c3fb23e8f08c334e16c595fa671c384'
     and '96a6f6c247b7609c9627fb805d843b72b9067a82'
---

a0a17d54ae3dfdf9acf1a339650701fe83efb500