From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Mon, 3 Dec 2007 11:51:48 +0000 (+0000)
Subject: merge of '3c3da8a3266f52fdedbc998f8e7f9dd516cc43eb'
X-Git-Tag: Release-2010-05/1~8236^2~7^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2b55f24fee0d2266fd9cc429b775986f37258362;p=openembedded.git

Merge ... '3c3da8a3266f52fdedbc998f8e7f9dd516cc43eb'
     and '97d055550d55ba933c423fa657f7d63d18b81ed6'
---

2b55f24fee0d2266fd9cc429b775986f37258362