From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Wed, 30 May 2007 10:17:59 +0000 (+0000)
Subject: merge of '917b0d8264255bcc05a47f9b2b7167bf8781ef46'
X-Git-Tag: Release-2010-05/1~8868^2~400^2~145
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d5cb13e05fa3b50b352e6d05386bb5db711b6808;p=openembedded.git

Merge ... '917b0d8264255bcc05a47f9b2b7167bf8781ef46'
     and 'd355cc8d988e0476f885987030dc5cdc1fc2614e'
---

d5cb13e05fa3b50b352e6d05386bb5db711b6808