From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Fri, 25 Aug 2006 10:22:29 +0000 (+0000)
Subject: merge of '20692657869f7a733266d5313f4932a7ff336fb4'
X-Git-Tag: Release-2010-05/1~9453^2~875^2~149^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=219969bfd684be1d202d581830107b98dd1c9165;p=openembedded.git

Merge ... '20692657869f7a733266d5313f4932a7ff336fb4'
     and 'df229e8fdb521adfc364395363401a190529731c'
---

219969bfd684be1d202d581830107b98dd1c9165