From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Sun, 22 Jan 2006 16:51:37 +0000 (+0000)
Subject: merge of 208f8ee44bce20b98a8ef3a6adc63102d293000e
X-Git-Tag: Release-2010-05/1~9453^2~2586
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fdb64f1c2631d69e6412857cca6e6120a20fe2eb;p=openembedded.git

merge of 208f8ee44bce20b98a8ef3a6adc63102d293000e
     and a51640b1884b40ac00b2e319003ae45c51e828fd
---

fdb64f1c2631d69e6412857cca6e6120a20fe2eb