From: Mika Laitio <lamikr@cc.jyu.fi>
Date: Fri, 10 Nov 2006 21:34:26 +0000 (+0000)
Subject: merge of '09a60ca1c7d8ce93fb27f1180373afc4410945cb'
X-Git-Tag: Release-2010-05/1~9453^2~481^2~3^2~10
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=433adeac1ae77a9f1ecd30521eea6dd483b29bcf;p=openembedded.git

Merge ... '09a60ca1c7d8ce93fb27f1180373afc4410945cb'
     and '788d9bed02362e1ac0eb5260f8bbe09e52676cf8'
---

433adeac1ae77a9f1ecd30521eea6dd483b29bcf