From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Fri, 17 Mar 2006 16:48:25 +0000 (+0000)
Subject: merge of 6b9aad33efbe7d42956463905d36b5d886340224
X-Git-Tag: Release-2010-05/1~9453^2~2232
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e105556303ed054db6d9e5bd40d06fa122125625;p=openembedded.git

merge of 6b9aad33efbe7d42956463905d36b5d886340224
     and c9370fe0b51a1422478e89483290e5776597d26c
---

e105556303ed054db6d9e5bd40d06fa122125625