From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Tue, 12 Jul 2005 14:31:22 +0000 (+0000)
Subject: merge of 8b01c8dc7fa2b317d2b847b773a4a60fb772c3c0
X-Git-Tag: Release-2010-05/1~9453^2~4184^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8160c902bf257fd426236dc3f38c2c0979439a43;p=openembedded.git

merge of 8b01c8dc7fa2b317d2b847b773a4a60fb772c3c0
     and a042d7f2632d838665be9302bfa325e117606441
---

8160c902bf257fd426236dc3f38c2c0979439a43