From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Wed, 23 Jan 2008 15:30:57 +0000 (+0000)
Subject: merge of 'b4db7faff89bf68649ff9993f351d168e6ee5446'
X-Git-Tag: Release-2010-05/1~7841
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=899e0e319cef44fa5d81d636722b3a3e24aa7cb3;p=openembedded.git

Merge ... 'b4db7faff89bf68649ff9993f351d168e6ee5446'
     and 'f8ff231a78b465cc9a7581f07cda1458d94ad382'
---

899e0e319cef44fa5d81d636722b3a3e24aa7cb3