From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Sun, 10 Jul 2005 23:41:43 +0000 (+0000)
Subject: merge of 69686210d4da1e6378022cc685a4b8d39463b899
X-Git-Tag: Release-2010-05/1~9453^2~2960^2^2~9^2~2^2~3^2^2~4^2~151
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3de8556d607ac3c9e3fee6ad912e8dc411483d70;p=openembedded.git

merge of 69686210d4da1e6378022cc685a4b8d39463b899
     and 99cf3abc759180ac01ae4e753542817b1163563d
---

3de8556d607ac3c9e3fee6ad912e8dc411483d70