From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Thu, 2 Aug 2007 14:58:09 +0000 (+0000)
Subject: merge of 'b25e19744697afbbde21b5770c7d4f474f5c201b'
X-Git-Tag: Release-2010-05/1~8868^2~40^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0f8d2f94ea9b713f9de60f489e463ccdec9f56dd;p=openembedded.git

Merge ... 'b25e19744697afbbde21b5770c7d4f474f5c201b'
     and 'fee382780bcf6b27faf2e00fc0272280e1e9d147'
---

0f8d2f94ea9b713f9de60f489e463ccdec9f56dd