From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Mon, 2 Apr 2007 09:58:18 +0000 (+0000)
Subject: merge of '696fafb88835f59c6692b229e898775cd7a46691'
X-Git-Tag: Release-2010-05/1~8868^2~859
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=04cf366f5e4eadee5f64f657f07a3cfa6986531f;p=openembedded.git

Merge ... '696fafb88835f59c6692b229e898775cd7a46691'
     and 'b3b8e63b9c7a291ec7420fbeb711be2b70875547'
---

04cf366f5e4eadee5f64f657f07a3cfa6986531f