From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Mon, 22 Aug 2005 17:46:51 +0000 (+0000)
Subject: merge of 6aabdcba32fb2d929d84f69140cc7b14d9af03c3
X-Git-Tag: Release-2010-05/1~9453^2~3849^2~2^2~3
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e127bf326edd7814fe02911ffcb1049e07539f8b;p=openembedded.git

merge of 6aabdcba32fb2d929d84f69140cc7b14d9af03c3
     and 738abaf46b3541916e48c08e9c9b267cfa97ca8d
---

e127bf326edd7814fe02911ffcb1049e07539f8b