From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Sun, 29 Oct 2006 11:03:41 +0000 (+0000)
Subject: merge of '79d76f976ca74f71f538f5c81a1e25b14ffe43f6'
X-Git-Tag: Release-2010-05/1~9453^2~556
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=35ba94be70961fd3f916afdbf15d2a7c8304301d;p=openembedded.git

Merge ... '79d76f976ca74f71f538f5c81a1e25b14ffe43f6'
     and 'b9ffe3b2fa4c42424206977c6be342c1305c83e7'
---

35ba94be70961fd3f916afdbf15d2a7c8304301d