From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Sun, 7 Jan 2007 21:58:19 +0000 (+0000)
Subject: merge of '486dfaf50b0883493e2087ab41dbc54b6ba33338'
X-Git-Tag: Release-2010-05/1~9424
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c1472054e4510147a63ed424542c0b6b77a76da7;p=openembedded.git

Merge ... '486dfaf50b0883493e2087ab41dbc54b6ba33338'
     and '94b9aca1341b3546d0d7977e277bfb7fbc1ba360'
---

c1472054e4510147a63ed424542c0b6b77a76da7