From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Sun, 5 Feb 2006 06:27:22 +0000 (+0000)
Subject: merge of 5c10c32633c6d23ce9ff5b6ba59db4ca12198c88
X-Git-Tag: Release-2010-05/1~9453^2~2456
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8334dd645cd67983293e9fc88a55ef5fcab245da;p=openembedded.git

merge of 5c10c32633c6d23ce9ff5b6ba59db4ca12198c88
     and 8f6968ad1301cc31f3e3ac81867844322372a640
---

8334dd645cd67983293e9fc88a55ef5fcab245da