From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Sun, 7 Jan 2007 15:09:16 +0000 (+0000)
Subject: merge of '8ccdb265a85a26c39e7d32c6e86840ea4cebb4b3'
X-Git-Tag: Release-2010-05/1~9434
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=299d9fbabea4d1b809de78082e7b35fadb28de1e;p=openembedded.git

Merge ... '8ccdb265a85a26c39e7d32c6e86840ea4cebb4b3'
     and 'e29766ec663642e32d6682b92e767b9b43dbe524'
---

299d9fbabea4d1b809de78082e7b35fadb28de1e