From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Mon, 11 Sep 2006 09:12:56 +0000 (+0000)
Subject: merge of 'e483dba7ba282bfa85b0013f80f8cb08cdc09e8c'
X-Git-Tag: Release-2010-05/1~9453^2~835^2~11
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=08a5d6e2d98541d9c96ea629bec10ef20c5dc0da;p=openembedded.git

Merge ... 'e483dba7ba282bfa85b0013f80f8cb08cdc09e8c'
     and 'ff6f66dceec5bbb396856d2556a977d4b646133e'
---

08a5d6e2d98541d9c96ea629bec10ef20c5dc0da