From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Wed, 2 May 2007 18:27:18 +0000 (+0000)
Subject: merge of '12fa8ef0c447968799315a8b55e6d534dbf250ab'
X-Git-Tag: Release-2010-05/1~8868^2~644^2~4^2~2^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=99cb96ea16a0649b18b9137de4706432e88300d0;p=openembedded.git

Merge ... '12fa8ef0c447968799315a8b55e6d534dbf250ab'
     and 'b896e366f22797c8a8d7c7db63a0236eefe66dc9'
---

99cb96ea16a0649b18b9137de4706432e88300d0