From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Sun, 14 Aug 2005 15:20:16 +0000 (+0000)
Subject: merge of 0b4f1ff980558815d31881bb337ccd459fa4af3a
X-Git-Tag: Release-2010-05/1~9453^2~3858^2~26^2~3
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=94506d0460100a669ad990f445c0fdd4ac4c4cda;p=openembedded.git

merge of 0b4f1ff980558815d31881bb337ccd459fa4af3a
     and 703248fa953456fdca6dcb68233a4bb5079fa7d4
---

94506d0460100a669ad990f445c0fdd4ac4c4cda