From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Sun, 7 Jan 2007 00:01:55 +0000 (+0000)
Subject: merge of '1fa25c4ed2c76f537724929745c0f65656880cc7'
X-Git-Tag: Release-2010-05/1~9435^2~14^2~4^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=76167f2c9ece28e73bc66088fd9c7e09357c1ca1;p=openembedded.git

Merge ... '1fa25c4ed2c76f537724929745c0f65656880cc7'
     and 'afcc206a6c21cda5ace989e895b14a6d341a213e'
---

76167f2c9ece28e73bc66088fd9c7e09357c1ca1