From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Sat, 9 Sep 2006 00:15:48 +0000 (+0000)
Subject: merge of 'b165fbe3e950981f7da69670c1c9d3268f79318d'
X-Git-Tag: Release-2010-05/1~9453^2~877^2~7^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9bc55c918c2689434ebf4e4eaafb6d31a0a63c24;p=openembedded.git

Merge ... 'b165fbe3e950981f7da69670c1c9d3268f79318d'
     and 'c56059bf1da2ea4d212ff175a446f6dfcec7d155'
---

9bc55c918c2689434ebf4e4eaafb6d31a0a63c24