From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Wed, 5 Oct 2005 19:58:35 +0000 (+0000)
Subject: merge of abb4ac4d99500dd9fcf6c133d3075c483c01868d
X-Git-Tag: Release-2010-05/1~9453^2~3354
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=de14cf30cf4d7f95911f135fed3bc93a6ae6bbad;p=openembedded.git

merge of abb4ac4d99500dd9fcf6c133d3075c483c01868d
     and dcae9da292239ca2d00a7cf805bfea8df8788bc8
---

de14cf30cf4d7f95911f135fed3bc93a6ae6bbad