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

Merge ... '31bb8b63bcf6d0058be6512a2ef765778179d5b7'
     and 'a718cfa84598b79768ec169f5aa277b23b9c79cf'
---

c238b57a1f2bec383c24cdf6b071b9e63d823e36