From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Fri, 11 Jan 2008 21:17:25 +0000 (+0000)
Subject: merge of '63328a4d6b1c9e161ae2921b106b5136b02fb764'
X-Git-Tag: Release-2010-05/1~7963
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a61486020471d960668245f5d167dabf0ab9e0e4;p=openembedded.git

Merge ... '63328a4d6b1c9e161ae2921b106b5136b02fb764'
     and 'd9c08e4fa1d5e137c28a0835802abcbcadeb294a'
---

a61486020471d960668245f5d167dabf0ab9e0e4