From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Sun, 29 Oct 2006 15:52:37 +0000 (+0000)
Subject: merge of '6c93a8de1538e8bdc646a20349816533c039982f'
X-Git-Tag: Release-2010-05/1~9453^2~550
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b0505dbec3ddf0653f17491b55787b8276fd50eb;p=openembedded.git

Merge ... '6c93a8de1538e8bdc646a20349816533c039982f'
     and '6d8ba6bbba365608edee9d1c140c3b5efbad8ab5'
---

b0505dbec3ddf0653f17491b55787b8276fd50eb