From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Thu, 11 Jan 2007 00:02:29 +0000 (+0000)
Subject: merge of '36c4738f33f62655f05a11ff3bfe0c431adeda20'
X-Git-Tag: Release-2010-05/1~9400^2~1^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=42bc6671a743c737ce3e70c779170ec9614b81ee;p=openembedded.git

Merge ... '36c4738f33f62655f05a11ff3bfe0c431adeda20'
     and 'accc204f8135cbcbd46a8c40ad53e20038c01f65'
---

42bc6671a743c737ce3e70c779170ec9614b81ee