From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Tue, 3 Jul 2007 17:01:04 +0000 (+0000)
Subject: merge of '1293c35f9186cb98ae4e1efe9e3cb8cc0e607def'
X-Git-Tag: Release-2010-05/1~8868^2~237
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=25550bf2091bb90cbde005e19b8e0dd049d239c8;p=openembedded.git

Merge ... '1293c35f9186cb98ae4e1efe9e3cb8cc0e607def'
     and '799ba111ed9bf4dd2c65638fc75b6af788b54ab7'
---

25550bf2091bb90cbde005e19b8e0dd049d239c8