From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Sat, 14 Jan 2006 06:22:41 +0000 (+0000)
Subject: merge of 198b28bba87e8c42ab6041406faa358334417c02
X-Git-Tag: Release-2010-05/1~9453^2~2654^2~12
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cda660808fbc381cc11fb9ceb3cd0cde13c239d7;p=openembedded.git

merge of 198b28bba87e8c42ab6041406faa358334417c02
     and 3862f1af15047c5bdc27ca357df15bdd3b9d80c3
---

cda660808fbc381cc11fb9ceb3cd0cde13c239d7